diff --git a/npm/ng-packs/packages/core/src/lib/interceptors/api.interceptor.ts b/npm/ng-packs/packages/core/src/lib/interceptors/api.interceptor.ts
index 79ec96809c..a2b08c07db 100644
--- a/npm/ng-packs/packages/core/src/lib/interceptors/api.interceptor.ts
+++ b/npm/ng-packs/packages/core/src/lib/interceptors/api.interceptor.ts
@@ -42,7 +42,7 @@ export class ApiInterceptor implements HttpInterceptor {
     }
 
     const tenant = this.sessionState.getTenant();
-    if (!existingHeaders?.has('__tenant') && tenant) {
+    if (!existingHeaders?.has('__tenant') && tenant?.id) {
       headers['__tenant'] = tenant.id;
     }