diff --git a/apps/studio/.env b/apps/studio/.env
index 5c8eb9662c2..ef7ab2ebc53 100644
--- a/apps/studio/.env
+++ b/apps/studio/.env
@@ -16,6 +16,8 @@ LOGFLARE_API_KEY=api-key
 # TODO: evaluate these variables at runtime instead
 # https://nextjs.org/docs/basic-features/environment-variables#loading-environment-variables
 NEXT_PUBLIC_SITE_URL=http://localhost:3000
+# Almost API calls are made to nextjs API routes
+NEXT_PUBLIC_API_URL=$NEXT_PUBLIC_SITE_URL/api
 NEXT_PUBLIC_GOTRUE_URL=$SUPABASE_PUBLIC_URL/auth/v1
 NEXT_PUBLIC_HCAPTCHA_SITE_KEY=10000000-ffff-ffff-ffff-000000000001
 
diff --git a/apps/studio/lib/constants/index.ts b/apps/studio/lib/constants/index.ts
index bf29f79cefa..6f367c31bb6 100644
--- a/apps/studio/lib/constants/index.ts
+++ b/apps/studio/lib/constants/index.ts
@@ -4,7 +4,9 @@ export * from './infrastructure'
 
 export const IS_PLATFORM = process.env.NEXT_PUBLIC_IS_PLATFORM === 'true'
 export const DEFAULT_HOME = IS_PLATFORM ? '/projects' : '/project/default'
-export const API_URL = IS_PLATFORM ? process.env.NEXT_PUBLIC_API_URL! : '/api'
+export const API_URL = process.env.NEXT_PUBLIC_API_URL
+
+// TODO: Replace PG_META_URL with STUDIO_PG_META_URL and remove all references to PLATFORM_PG_META_URL
 export const PG_META_URL = IS_PLATFORM
   ? process.env.PLATFORM_PG_META_URL
   : process.env.STUDIO_PG_META_URL