diff --git a/surfsense_web/lib/apis/base-api.service.ts b/surfsense_web/lib/apis/base-api.service.ts
index 269fd916c..0819cbc7c 100644
--- a/surfsense_web/lib/apis/base-api.service.ts
+++ b/surfsense_web/lib/apis/base-api.service.ts
@@ -9,7 +9,7 @@ import {
 	NetworkError,
 	NotFoundError,
 } from "../error";
-
+import { BACKEND_URL } from "@/lib/env-config";
 enum ResponseType {
 	JSON = "json",
 	TEXT = "text",
@@ -390,4 +390,4 @@ class BaseApiService {
 	}
 }
 
-export const baseApiService = new BaseApiService(process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL || "");
+export const baseApiService = new BaseApiService(BACKEND_URL);
diff --git a/surfsense_web/lib/auth-utils.ts b/surfsense_web/lib/auth-utils.ts
index 4848f4ab7..645a6d1ba 100644
--- a/surfsense_web/lib/auth-utils.ts
+++ b/surfsense_web/lib/auth-utils.ts
@@ -1,7 +1,7 @@
 /**
  * Authentication utilities for handling token expiration and redirects
  */
-
+import { BACKEND_URL } from "@/lib/env-config";
 const REDIRECT_PATH_KEY = "surfsense_redirect_path";
 const BEARER_TOKEN_KEY = "surfsense_bearer_token";
 const REFRESH_TOKEN_KEY = "surfsense_refresh_token";
@@ -194,8 +194,7 @@ export async function logout(): Promise<boolean> {
 	// Call backend to revoke the refresh token
 	if (refreshToken) {
 		try {
-			const backendUrl = process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL || "http://localhost:8000";
-			const response = await fetch(`${backendUrl}/auth/jwt/revoke`, {
+			const response = await fetch(`${BACKEND_URL}/auth/jwt/revoke`, {
 				method: "POST",
 				headers: {
 					"Content-Type": "application/json",
@@ -273,8 +272,7 @@ export async function refreshAccessToken(): Promise<string | null> {
 	isRefreshing = true;
 	refreshPromise = (async () => {
 		try {
-			const backendUrl = process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL || "http://localhost:8000";
-			const response = await fetch(`${backendUrl}/auth/jwt/refresh`, {
+			const response = await fetch(`${BACKEND_URL}/auth/jwt/refresh`, {
 				method: "POST",
 				headers: {
 					"Content-Type": "application/json",
diff --git a/surfsense_web/lib/chat/thread-persistence.ts b/surfsense_web/lib/chat/thread-persistence.ts
index 4cf9b8e68..abe6bc02c 100644
--- a/surfsense_web/lib/chat/thread-persistence.ts
+++ b/surfsense_web/lib/chat/thread-persistence.ts
@@ -4,7 +4,7 @@
  */
 
 import { baseApiService } from "@/lib/apis/base-api.service";
-
+import { BACKEND_URL } from "@/lib/env-config";
 // =============================================================================
 // Types matching backend schemas
 // =============================================================================
@@ -228,6 +228,5 @@ export interface RegenerateParams {
  * Get the URL for the regenerate endpoint (for streaming fetch)
  */
 export function getRegenerateUrl(threadId: number): string {
-	const backendUrl = process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL || "http://localhost:8000";
-	return `${backendUrl}/api/v1/threads/${threadId}/regenerate`;
+	return `${BACKEND_URL}/api/v1/threads/${threadId}/regenerate`;
 }