diff --git a/core/client/app/assets/lib/uploader.js b/core/client/app/assets/lib/uploader.js
index e2f38a80df..4bd8ef1968 100644
--- a/core/client/app/assets/lib/uploader.js
+++ b/core/client/app/assets/lib/uploader.js
@@ -206,6 +206,7 @@ UploadUi = function ($dropzone, settings) {
             var self = this;
 
             // This is the start point if an image already exists
+            this.removeExtras();
             $dropzone.removeClass('image-uploader image-uploader-url').addClass('pre-image-uploader');
             $dropzone.find('div.description').hide();
             $dropzone.find('img.js-upload-target').show();
diff --git a/core/client/app/components/gh-uploader.js b/core/client/app/components/gh-uploader.js
index aa984d82f3..96ef21e3db 100644
--- a/core/client/app/components/gh-uploader.js
+++ b/core/client/app/components/gh-uploader.js
@@ -74,7 +74,7 @@ export default Ember.Component.extend({
                 self.sendAction('canceled');
             });
 
-            this.sendAction('initUploader', this.get('uploaderReference'));
+            this.sendAction('initUploader', ref);
         }
     }
 });