diff --git a/app/assets/javascripts/discourse/templates/modal/upload_selector.hbs b/app/assets/javascripts/discourse/templates/modal/upload_selector.hbs
index 9957e2ffc0..394153f71b 100644
--- a/app/assets/javascripts/discourse/templates/modal/upload_selector.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/upload_selector.hbs
@@ -5,7 +5,7 @@
       <label class="radio" for="local">{{i18n 'upload_selector.from_my_computer'}}</label>
       {{#if local}}
         <div class="inputs">
-          <input type="file" id="filename-input"><br>
+          <input type="file" id="filename-input" multiple><br>
           <span class="description">{{unbound view.tip}}</span>
         </div>
       {{/if}}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index a39e8800ba..501c5e589d 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -848,8 +848,8 @@ en:
       from_the_web: "From the web"
       remote_tip: "link to image"
       remote_tip_with_attachments: "link to image or file ({{authorized_extensions}})"
-      local_tip: "click to select an image from your device"
-      local_tip_with_attachments: "click to select an image or file from your device ({{authorized_extensions}})"
+      local_tip: "click to select up to 10 images from your device"
+      local_tip_with_attachments: "click to select up to 10 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 to upload them)"
       uploading: "Uploading"