diff --git a/src/Database/Models/Tenant.php b/src/Database/Models/Tenant.php
index 66123dda..e29a54ec 100644
--- a/src/Database/Models/Tenant.php
+++ b/src/Database/Models/Tenant.php
@@ -17,7 +17,7 @@ use Stancl\Tenancy\Events;
  * @property Carbon $updated_at
  * @property array $data
  *
- * @method TenantCollection all()
+ * @method static TenantCollection all()
  */
 class Tenant extends Model implements Contracts\Tenant
 {
diff --git a/src/Database/TenantScope.php b/src/Database/TenantScope.php
index fff16996..8592f16c 100644
--- a/src/Database/TenantScope.php
+++ b/src/Database/TenantScope.php
@@ -17,7 +17,7 @@ class TenantScope implements Scope
             return;
         }
 
-        $builder->where(BelongsToTenant::$tenantIdColumn, tenant()->getTenantKey());
+        $builder->where($model->qualifyColumn(BelongsToTenant::$tenantIdColumn), tenant()->getTenantKey());
     }
 
     public function extend(Builder $builder)