diff --git a/app/controllers/concerns/multi_tenancy.rb b/app/controllers/concerns/multi_tenancy.rb
index b9e74556..cb44389b 100644
--- a/app/controllers/concerns/multi_tenancy.rb
+++ b/app/controllers/concerns/multi_tenancy.rb
@@ -13,8 +13,8 @@ module MultiTenancy
   end
 
   def find_tenant_by_subdomain_or_name
-    if request.subdomains.last && request.subdomains.last != "www"
-      set_current_tenant(Shop.find_by(subdomain: request.subdomains.last))
+    if request.subdomains.first && request.subdomains.first != "www"
+      set_current_tenant(Shop.find_by(subdomain: request.subdomains.first))
     elsif Shop.count == 1
       set_current_tenant(Shop.first)
     end