diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6
index 7a26db929d4..1c3c18bc571 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/d-editor.js.es6
@@ -842,7 +842,7 @@ export default Component.extend({
     }
 
     const isComposer = $("#reply-control .d-editor-input").is(":focus");
-    let { clipboard, canPasteHtml } = clipboardData(e, isComposer);
+    let { clipboard, canPasteHtml, canUpload } = clipboardData(e, isComposer);
 
     let plainText = clipboard.getData("text/plain");
     let html = clipboard.getData("text/html");
@@ -892,7 +892,7 @@ export default Component.extend({
       }
     }
 
-    if (handled) {
+    if (handled || canUpload) {
       e.preventDefault();
     }
   },