diff --git a/frontend/src/core/config/index.ts b/frontend/src/core/config/index.ts
index a9cfba0..49ea851 100644
--- a/frontend/src/core/config/index.ts
+++ b/frontend/src/core/config/index.ts
@@ -1,5 +1,9 @@
 import { env } from "@/env";
 
 export function getBackendBaseURL() {
-  return env.NEXT_PUBLIC_BACKEND_BASE_URL ?? "http://localhost:8000";
+  if (env.NEXT_PUBLIC_BACKEND_BASE_URL) {
+    return env.NEXT_PUBLIC_BACKEND_BASE_URL;
+  } else {
+    return "http://localhost:8000";
+  }
 }
diff --git a/frontend/src/env.js b/frontend/src/env.js
index ebff7e1..c32228b 100644
--- a/frontend/src/env.js
+++ b/frontend/src/env.js
@@ -24,10 +24,7 @@ export const env = createEnv({
    * `NEXT_PUBLIC_`.
    */
   client: {
-    NEXT_PUBLIC_BACKEND_BASE_URL: z
-      .string()
-      .optional()
-      .default("http://localhost:8000/api"),
+    NEXT_PUBLIC_BACKEND_BASE_URL: z.string().optional(),
   },
 
   /**