diff --git a/frontend/src/api/mutator.ts b/frontend/src/api/mutator.ts
index 0c0037c..257eeeb 100644
--- a/frontend/src/api/mutator.ts
+++ b/frontend/src/api/mutator.ts
@@ -1,4 +1,4 @@
-import { getLocalAuthToken, isLocalAuthMode } from "@/auth/localAuth";
+import { getEnvToken, getLocalAuthToken, isLocalAuthMode } from "@/auth/localAuth";
 import { getApiBaseUrl } from "@/lib/api-base";
 
 type ClerkSession = {
@@ -48,7 +48,7 @@ export const customFetch = async <T>(
     headers.set("Content-Type", "application/json");
   }
   if (isLocalAuthMode() && !headers.has("Authorization")) {
-    const token = getLocalAuthToken();
+    const token = getLocalAuthToken() ?? getEnvToken();
     if (token) {
       headers.set("Authorization", `Bearer ${token}`);
     }
diff --git a/frontend/src/auth/clerk.tsx b/frontend/src/auth/clerk.tsx
index a6508d4..7d3343e 100644
--- a/frontend/src/auth/clerk.tsx
+++ b/frontend/src/auth/clerk.tsx
@@ -16,10 +16,10 @@ import {
 } from "@clerk/nextjs";
 
 import { isLikelyValidClerkPublishableKey } from "@/auth/clerkKey";
-import { getLocalAuthToken, isLocalAuthMode } from "@/auth/localAuth";
+import { getEnvToken, getLocalAuthToken, isLocalAuthMode } from "@/auth/localAuth";
 
 function hasLocalAuthToken(): boolean {
-  return Boolean(getLocalAuthToken());
+  return Boolean(getLocalAuthToken() ?? getEnvToken());
 }
 
 export function isClerkEnabled(): boolean {
@@ -76,7 +76,7 @@ export function useUser() {
 
 export function useAuth() {
   if (isLocalAuthMode()) {
-    const token = getLocalAuthToken();
+    const token = getLocalAuthToken() ?? getEnvToken();
     return {
       isLoaded: true,
       isSignedIn: Boolean(token),