diff --git a/src/Infrastructure/TakeoutSaaS.Infrastructure/Common/Persistence/TenantAwareDbContext.cs b/src/Infrastructure/TakeoutSaaS.Infrastructure/Common/Persistence/TenantAwareDbContext.cs
index 66e0f41..19cf5ca 100644
--- a/src/Infrastructure/TakeoutSaaS.Infrastructure/Common/Persistence/TenantAwareDbContext.cs
+++ b/src/Infrastructure/TakeoutSaaS.Infrastructure/Common/Persistence/TenantAwareDbContext.cs
@@ -61,7 +61,7 @@ public abstract class TenantAwareDbContext(
     private void SetTenantFilter<TEntity>(ModelBuilder modelBuilder)
         where TEntity : class, IMultiTenantEntity
     {
-        modelBuilder.Entity<TEntity>().HasQueryFilter(entity => entity.TenantId == CurrentTenantId);
+        modelBuilder.Entity<TEntity>().HasQueryFilter(entity => CurrentTenantId == 0 || entity.TenantId == CurrentTenantId);
     }
 
     /// <summary>