diff --git a/config/routes.rb b/config/routes.rb
index 201dd6dd931..86ceb31d2ed 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -293,9 +293,9 @@ Discourse::Application.routes.draw do
   # used to download original images
   get "uploads/:site/:sha" => "uploads#show", constraints: { site: /\w+/, sha: /[a-f0-9]{40}/ }
   # used to dowwload attachments
-  get "uploads/:site/original/:tree/:sha:extension" => "uploads#show", constraints: { site: /\w+/, sha: /[a-f0-9]{40}/, extension: /\.\w{2,}/ }
+  get "uploads/:site/original/:tree:sha" => "uploads#show", constraints: { site: /\w+/, tree: /(\w+\/)+/i, sha: /[a-f0-9]{40}/ }
   # used to download attachments (old route)
-  get "uploads/:site/:id/:sha:extension" => "uploads#show", constraints: { site: /\w+/, id: /\d+/, sha: /[a-f0-9]{16}/, extension: /\.\w{2,}/ }
+  get "uploads/:site/:id/:sha" => "uploads#show", constraints: { site: /\w+/, id: /\d+/, sha: /[a-f0-9]{16}/ }
 
   get "posts" => "posts#latest"
   get "posts/by_number/:topic_id/:post_number" => "posts#by_number"