diff --git a/app/assets/javascripts/discourse/components/image-uploader.js.es6 b/app/assets/javascripts/discourse/components/image-uploader.js.es6
index 4abcc3ee5b1..433d1c95499 100644
--- a/app/assets/javascripts/discourse/components/image-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/image-uploader.js.es6
@@ -6,7 +6,7 @@ export default Em.Component.extend(UploadMixin, {
 
   @computed("imageUrl")
   backgroundStyle(imageUrl) {
-    if (Em.isNone(imageUrl)) {
+    if (Em.isEmpty(imageUrl)) {
       return "".htmlSafe();
     }
 
@@ -15,7 +15,7 @@ export default Em.Component.extend(UploadMixin, {
 
   @computed("backgroundStyle")
   hasBackgroundStyle(backgroundStyle) {
-    Ember.isEmpty(backgroundStyle);
+    return !Ember.isEmpty(backgroundStyle.string);
   },
 
   validateUploadedFilesOptions() {
diff --git a/test/javascripts/components/image-uploader-test.js.es6 b/test/javascripts/components/image-uploader-test.js.es6
index 223fe39c8d8..94740b3fe71 100644
--- a/test/javascripts/components/image-uploader-test.js.es6
+++ b/test/javascripts/components/image-uploader-test.js.es6
@@ -1,10 +1,34 @@
 import componentTest from "helpers/component-test";
 moduleForComponent("image-uploader", { integration: true });
 
+componentTest("with image", {
+  template: "{{image-uploader imageUrl='/some/upload.png'}}",
+
+  test(assert) {
+    assert.equal(
+      this.$(".d-icon-picture-o").length,
+      1,
+      "it displays the upload icon"
+    );
+
+    assert.equal(
+      this.$(".d-icon-trash-o").length,
+      1,
+      "it displays the trash icon"
+    );
+  }
+});
+
 componentTest("without image", {
   template: "{{image-uploader}}",
 
   test(assert) {
+    assert.equal(
+      this.$(".d-icon-picture-o").length,
+      1,
+      "it displays the upload icon"
+    );
+
     assert.equal(
       this.$(".d-icon-trash-o").length,
       0,