diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 96005b92..2b02d17c 100755
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -200,7 +200,10 @@
             </a>
         </div>
         <div class="navbar-center-section">
-            <%= Shop.current_shop.name %>
+            <% shop = nil %>
+            <% shop = current_shop if respond_to?(:current_shop) %>
+            <% shop ||= Shop.current_shop if Shop.respond_to?(:current_shop) %>
+            <%= shop&.name.to_s %>
         </div>
         <div class="navbar-right-section">
             <%# Connection Status %>