diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index 64852af0160..73bf3b674a5 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -98,7 +98,7 @@ class UploadsController < ApplicationController
       if Discourse.store.internal?
         send_file_local_upload(upload)
       else
-        redirect_to Discourse.store.path_for(upload)
+        redirect_to upload.url
       end
     else
       render_404
diff --git a/lib/file_store/s3_store.rb b/lib/file_store/s3_store.rb
index df3296f7abd..a23ccb2af56 100644
--- a/lib/file_store/s3_store.rb
+++ b/lib/file_store/s3_store.rb
@@ -102,12 +102,7 @@ module FileStore
 
     def path_for(upload)
       url = upload&.url
-
-      if url && url[/^\/[^\/]/]
-        FileStore::LocalStore.new.path_for(upload)
-      else
-        url
-      end
+      FileStore::LocalStore.new.path_for(upload) if url && url[/^\/[^\/]/]
     end
 
     def cdn_url(url)