update multi tenancy

app/controllers/concerns/multi_tenancy.rb

@@ -3,16 +3,25 @@ module MultiTenancy
 
   included do
     set_current_tenant_through_filter if respond_to? :set_current_tenant_through_filter
-    before_action :set_current_tenant_by_subdomain_or_frist if respond_to? :before_action
+    before_action :set_current_tenant_by_subdomain_or_first if respond_to? :before_action
     helper_method :current_shop if respond_to? :helper_method
   end
 
   private
-  def set_current_tenant_by_subdomain_or_frist
+  def set_current_tenant_by_subdomain_or_first
+    find_tenant_by_subdomain_or_frist || not_found
+  end
+
+  def find_tenant_by_subdomain_or_frist
     if request.subdomains.last && request.subdomains.last != 'www'
       set_current_tenant(Shop.find_by(subdomain: request.subdomains.last))
+    elsif ENV["SERVER_MODE"] == "application"
+      set_current_tenant(Shop.first)
     end
-    set_current_tenant(Shop.first) if current_tenant.nil?
+  end
+
+  def not_found
+    head :not_found
   end
 
   def current_shop