diff --git a/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js b/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js
index af1a98571b5..961f690a68e 100644
--- a/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js
+++ b/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js
@@ -60,6 +60,8 @@ export default Mixin.create({
 
     this.appEvents.off("composer:add-files", this._addFiles.bind(this));
 
+    this._reset();
+
     if (this._uppyInstance) {
       this._uppyInstance.close();
       this._uppyInstance = null;
diff --git a/app/assets/javascripts/discourse/app/mixins/composer-upload.js b/app/assets/javascripts/discourse/app/mixins/composer-upload.js
index 72ebf67e90a..5dbbbb94a66 100644
--- a/app/assets/javascripts/discourse/app/mixins/composer-upload.js
+++ b/app/assets/javascripts/discourse/app/mixins/composer-upload.js
@@ -129,6 +129,13 @@ export default Mixin.create({
 
     const $element = $(this.element);
 
+    this.setProperties({
+      uploadProgress: 0,
+      isUploading: false,
+      isProcessingUpload: false,
+      isCancellable: false,
+    });
+
     $.blueimp.fileupload.prototype.processActions = this.uploadProcessorActions;
 
     $element.fileupload({