diff --git a/frontend/src/modules/auth/services/auth.service.ts b/frontend/src/modules/auth/services/auth.service.ts
index cc8c80af67..cb699658b4 100644
--- a/frontend/src/modules/auth/services/auth.service.ts
+++ b/frontend/src/modules/auth/services/auth.service.ts
@@ -1,4 +1,5 @@
 import { Auth0Service } from '@/modules/auth/services/auth0.service';
+import config from '@/config';
 
 class AuthServiceClass {
   setToken(token: string) {
@@ -14,7 +15,7 @@ class AuthServiceClass {
   }
 
   getTenantId() {
-    return localStorage.getItem('currentTenant');
+    return localStorage.getItem('currentTenant') || config.lf.tenantId;
   }
 
   logout() {
diff --git a/frontend/src/modules/lf/segments/lf-segments-service.js b/frontend/src/modules/lf/segments/lf-segments-service.js
index a054785b0a..1d6f57d9bd 100644
--- a/frontend/src/modules/lf/segments/lf-segments-service.js
+++ b/frontend/src/modules/lf/segments/lf-segments-service.js
@@ -51,6 +51,10 @@ export class LfService {
   static async queryProjectGroups(body) {
     const tenantId = AuthService.getTenantId();
 
+    if (!tenantId) {
+      return { rows: [], count: 0 };
+    }
+
     const response = await authAxios.post(
       `/tenant/${tenantId}/segment/projectGroup/query`,
       {