diff --git a/config/initializers/active_storage.rb b/config/initializers/active_storage.rb
index 096239d13..de51ae1f1 100644
--- a/config/initializers/active_storage.rb
+++ b/config/initializers/active_storage.rb
@@ -8,3 +8,23 @@ end
 ActiveSupport.on_load(:active_storage_record) do
   connects_to database: { writing: :primary, reading: :replica }
 end
+
+module ActiveStorageControllerExtensions
+  extend ActiveSupport::Concern
+
+  included do
+    before_action do
+      # Add script_name so that Disk Service will generate correct URLs for uploads
+      ActiveStorage::Current.url_options = {
+        protocol: request.protocol,
+        host: request.host,
+        port: request.port,
+        script_name: request.script_name
+      }
+    end
+  end
+end
+
+Rails.application.config.to_prepare do
+  ActiveStorage::BaseController.include ActiveStorageControllerExtensions
+end