diff --git a/app/assets/stylesheets/darkswarm/shop.css.sass b/app/assets/stylesheets/darkswarm/shop.css.sass
index 554d3f2f4e..ca349efd44 100644
--- a/app/assets/stylesheets/darkswarm/shop.css.sass
+++ b/app/assets/stylesheets/darkswarm/shop.css.sass
@@ -68,3 +68,14 @@
 
       i.ofn-i_036-producers
         padding-left: 0.5rem
+
+  .shopfront_message, .shopfront_closed_message
+    padding: 15px
+    border-radius: 5px
+    border: 2px solid #eb4c46
+
+  .shopfront_message
+    margin-top: 2em
+
+  .shopfront_closed_message
+    margin: 2em 0em
diff --git a/app/views/shop/_messages.html.haml b/app/views/shop/_messages.html.haml
new file mode 100644
index 0000000000..7a0a5af811
--- /dev/null
+++ b/app/views/shop/_messages.html.haml
@@ -0,0 +1,10 @@
+- if @order_cycles and @order_cycles.empty?
+  .row
+    .small-12.columns
+      .shopfront_closed_message
+        = current_distributor.preferred_shopfront_message
+- elsif current_distributor.preferred_shopfront_message.present?
+  .row
+    .small-12.columns
+      .shopfront_message
+        = current_distributor.preferred_shopfront_message
diff --git a/app/views/shop/show.html.haml b/app/views/shop/show.html.haml
index 048dd13e73..89ce1a30ac 100644
--- a/app/views/shop/show.html.haml
+++ b/app/views/shop/show.html.haml
@@ -1,4 +1,4 @@
-= inject_enterprises 
+= inject_enterprises
 
 %shop.darkswarm
   - content_for :order_cycle_form do
@@ -12,15 +12,17 @@
 
       / Will this label should be a variable to reflect 'Ready for pickup / delivery' as appropriate
 
-      %select.avenir#order_cycle_id{"ng-model" => "order_cycle.order_cycle_id", 
+      %select.avenir#order_cycle_id{"ng-model" => "order_cycle.order_cycle_id",
               "ng-change" => "changeOrderCycle()",
               "ng-options" => "oc.id as oc.time for oc in #{@order_cycles.map {|oc| {time: pickup_time(oc), id: oc.id}}.to_json}",
               "popover-placement" => "left", "popover" => "Choose when you want your order:", "popover-trigger" => "openTrigger"}
 
-       
+
 
   = render partial: "shopping_shared/details"
 
+  = render partial: 'shop/messages'
+
   .row
     = render partial: "shop/products/form"