diff --git a/apps/studio/data/config/project-endpoint-query.ts b/apps/studio/data/config/project-endpoint-query.ts
index d1a7c1bd028..9311f7f5ff8 100644
--- a/apps/studio/data/config/project-endpoint-query.ts
+++ b/apps/studio/data/config/project-endpoint-query.ts
@@ -34,7 +34,8 @@ export const useProjectApiUrl = (
   const protocol = settings?.app_config?.protocol ?? 'https'
   const endpoint = settings?.app_config?.endpoint
 
-  const hostEndpoint = isSuccessProjectSettings ? `${protocol}://${endpoint}` : undefined
+  const hostEndpoint =
+    isSuccessProjectSettings && endpoint ? `${protocol}://${endpoint}` : undefined
   const resolvedEndpoint = isCustomDomainsActive ? customEndpoint : hostEndpoint
   const storageEndpoint = settings?.app_config?.storage_endpoint
     ? `${IS_PLATFORM ? 'https' : protocol}://${settings?.app_config?.storage_endpoint}`