diff --git a/app/Http/Middleware/DatabaseLookup.php b/app/Http/Middleware/DatabaseLookup.php
index d76f56e69515..345a063805a2 100644
--- a/app/Http/Middleware/DatabaseLookup.php
+++ b/app/Http/Middleware/DatabaseLookup.php
@@ -10,6 +10,7 @@ use App\Models\LookupInvitation;
 use App\Models\LookupAccountToken;
 use App\Models\LookupUser;
 use Auth;
+use Utils;
 
 class DatabaseLookup
 {
@@ -46,6 +47,11 @@ class DatabaseLookup
                 LookupContact::setServerByField('contact_key', $key);
             } elseif ($key = request()->account_key) {
                 LookupAccount::setServerByField('account_key', $key);
+            } else {
+                $subdomain = Utils::getSubdomain(\Request::server('HTTP_HOST'));
+                if ($subdomain != 'app') {
+                    LookupAccount::setServerByField('subdomain', $subdomain);
+                }
             }
         } elseif ($guard == 'postmark') {
             LookupInvitation::setServerByField('message_id', request()->MessageID);