diff --git a/app/assets/javascripts/darkswarm/services/products.js.coffee b/app/assets/javascripts/darkswarm/services/products.js.coffee
index e6ff0d0b03..cc4ffbf259 100644
--- a/app/assets/javascripts/darkswarm/services/products.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/products.js.coffee
@@ -44,4 +44,5 @@ Darkswarm.factory 'Products', ($resource, Enterprises, Dereferencer, Taxons, Car
           product.price = Math.min.apply(null, prices)
         product.hasVariants = product.variants?.length > 0
         
-        product.primaryImage = product.images[0]?.small_url || "/assets/noimage/small.png"
+        product.primaryImage = product.images[0]?.small_url
+        product.primaryImageOrMissing = product.primaryImage || "/assets/noimage/small.png"
diff --git a/app/assets/javascripts/templates/product_modal.html.haml b/app/assets/javascripts/templates/product_modal.html.haml
index 76a57d40cd..8b35cf79c5 100644
--- a/app/assets/javascripts/templates/product_modal.html.haml
+++ b/app/assets/javascripts/templates/product_modal.html.haml
@@ -1,6 +1,6 @@
 .row
   .columns.small-12.large-6
-    %img.product-img{"ng-src" => "{{product.images[0].large_url}}", "ng-if" => "product.images[0]"} 
+    %img.product-img{"ng-src" => "{{product.primaryImage}}", "ng-if" => "product.primaryImage"} 
   .columns.small-12.large-6.product-header
     %h2 
       %render-svg{path: "{{product.primary_taxon.icon}}"}
diff --git a/app/views/shop/products/_summary.html.haml b/app/views/shop/products/_summary.html.haml
index 45b6136875..77f43702cc 100644
--- a/app/views/shop/products/_summary.html.haml
+++ b/app/views/shop/products/_summary.html.haml
@@ -1,6 +1,6 @@
 .product-thumb
   %a{"ng-click" => "triggerProductModal()"}
-    %img{"bo-src" => "product.primaryImage", "ng-click" => "triggerProductModal()"}
+    %img{"bo-src" => "product.primaryImageOrMissing", "ng-click" => "triggerProductModal()"}
 
 .row.summary
   .small-9.medium-10.large-11.columns.summary-header