diff --git a/config/initializers/tenanting/turbo.rb b/config/initializers/tenanting/turbo.rb
index 67447a58b..9923fc0d3 100644
--- a/config/initializers/tenanting/turbo.rb
+++ b/config/initializers/tenanting/turbo.rb
@@ -1,19 +1,17 @@
-# # TODO:PLANB: we probably still need to set script_name properly
-# module TurboStreamsJobExtensions
-#   extend ActiveSupport::Concern
+module TurboStreamsJobExtensions
+  extend ActiveSupport::Concern
 
-#   class_methods do
-#     def render_format(format, **rendering)
-#       if ApplicationRecord.current_tenant
-#         script_name = "/#{ApplicationRecord.current_tenant}"
-#         ApplicationController.renderer.new(script_name: script_name).render(formats: [ format ], **rendering)
-#       else
-#         super
-#       end
-#     end
-#   end
-# end
+  class_methods do
+    def render_format(format, **rendering)
+      if Current.account.present?
+        ApplicationController.renderer.new(script_name: Current.account.slug).render(formats: [ format ], **rendering)
+      else
+        super
+      end
+    end
+  end
+end
 
-# Rails.application.config.after_initialize do
-#   Turbo::StreamsChannel.prepend TurboStreamsJobExtensions
-# end
+Rails.application.config.after_initialize do
+  Turbo::StreamsChannel.prepend TurboStreamsJobExtensions
+end