diff --git a/app/assets/javascripts/discourse/views/upload-selector.js.es6 b/app/assets/javascripts/discourse/views/upload-selector.js.es6
index e8967b8b2..4bf80f2aa 100644
--- a/app/assets/javascripts/discourse/views/upload-selector.js.es6
+++ b/app/assets/javascripts/discourse/views/upload-selector.js.es6
@@ -27,9 +27,9 @@ export default ModalBodyView.extend({
   },
 
   tip: function() {
-    const source = this.get("controller.local") ? "local" : "remote",
-          opts = { authorized_extensions: Discourse.Utilities.authorizedExtensions() };
-    return uploadTranslate(source + "_tip", opts);
+    const source = this.get("controller.local") ? "local" : "remote";
+    const authorized_extensions = Discourse.Utilities.authorizesAllExtensions() ? "" : `(${Discourse.Utilities.authorizedExtensions()})`;
+    return uploadTranslate(source + "_tip", { authorized_extensions });
   }.property("controller.local"),
 
   hint: function() {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index f51f35b04..af5d2e6e0 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -967,9 +967,9 @@ en:
       from_my_computer: "From my device"
       from_the_web: "From the web"
       remote_tip: "link to image"
-      remote_tip_with_attachments: "link to image or file ({{authorized_extensions}})"
+      remote_tip_with_attachments: "link to image or file {{authorized_extensions}}"
       local_tip: "select images from your device"
-      local_tip_with_attachments: "select images or files from your device ({{authorized_extensions}})"
+      local_tip_with_attachments: "select images or files from your device {{authorized_extensions}}"
       hint: "(you can also drag & drop into the editor to upload them)"
       hint_for_supported_browsers: "you can also drag and drop or paste images into the editor"
       uploading: "Uploading"