diff --git a/app/controllers/concerns/multi_tenancy.rb b/app/controllers/concerns/multi_tenancy.rb
index 643a7455..a88cc9e0 100644
--- a/app/controllers/concerns/multi_tenancy.rb
+++ b/app/controllers/concerns/multi_tenancy.rb
@@ -3,19 +3,19 @@ module MultiTenancy
 
   included do
     set_current_tenant_through_filter if respond_to? :set_current_tenant_through_filter
-    before_action :find_shop_by_subdomain_or_frist if respond_to? :before_action
+    before_action :set_current_tenant_by_subdomain_or_frist if respond_to? :before_action
     helper_method :current_shop if respond_to? :helper_method
   end
 
   private
-  def find_shop_by_subdomain_or_frist
-    if request.subdomains.last
-      set_current_tenant(Shop.find_by(shop_code: request.subdomains.last.partition('-').last))
+  def set_current_tenant_by_subdomain_or_frist
+    if request.subdomains.last && request.subdomains.last != 'www'
+      set_current_tenant(Shop.find_by(subdomain: request.subdomains.last))
     end
-    current_shop
+    set_current_tenant(Shop.first) if current_tenant.nil?
   end
 
   def current_shop
-    @shop ||= Shop.current_shop
+    ActsAsTenant.current_tenant
   end
 end
diff --git a/app/models/shop.rb b/app/models/shop.rb
index e898e4e0..2a366927 100755
--- a/app/models/shop.rb
+++ b/app/models/shop.rb
@@ -12,6 +12,6 @@ class Shop < ApplicationRecord
 	end
 
   def self.current_shop
-    RequestStore["current_shop"] ||= ActsAsTenant.current_tenant || Shop.first
+    ActsAsTenant.current_tenant
   end
 end