diff --git a/app/helpers/appearances_helper.rb b/app/helpers/appearances_helper.rb
index 80b9ed3a14..6c8ba7936d 100644
--- a/app/helpers/appearances_helper.rb
+++ b/app/helpers/appearances_helper.rb
@@ -8,13 +8,15 @@ module AppearancesHelper
   end
 
   def brand_image
-    logo = if brand_item
-             brand_item.logo
-           else
-             'brand_logo.png'
-           end
-
-    image_tag logo
+    if brand_item
+      if brand_item.logo?
+        image_tag brand_item.logo
+      else
+        nil
+      end
+    else
+      image_tag 'brand_logo.png'
+    end
   end
 
   def brand_text
diff --git a/app/views/admin/appearances/_form.html.haml b/app/views/admin/appearances/_form.html.haml
index 742d6433c6..0313ffd559 100644
--- a/app/views/admin/appearances/_form.html.haml
+++ b/app/views/admin/appearances/_form.html.haml
@@ -17,7 +17,7 @@
   .form-group
     = f.label :logo, class: 'control-label'
     .col-sm-10
-      - if @appearance.logo
+      - if @appearance.logo?
         = image_tag @appearance.logo, class: 'appearance-logo-preview'
       = f.file_field :logo, class: ""
       .hint