diff --git a/server/src/honoMiddlewares/betterAuthMiddleware.ts b/server/src/honoMiddlewares/betterAuthMiddleware.ts
index 42ce02855..ea75142cb 100644
--- a/server/src/honoMiddlewares/betterAuthMiddleware.ts
+++ b/server/src/honoMiddlewares/betterAuthMiddleware.ts
@@ -57,7 +57,10 @@ export const betterAuthMiddleware = async (c: Context<HonoEnv>, next: Next) => {
 	}
 
 	// Step 4: Fetch org and features from database
-	ctx.env = c.req.header("app_env") as AppEnv;
+	const appEnvHeader = c.req.header("app_env") as AppEnv;
+	if (appEnvHeader) {
+		ctx.env = appEnvHeader;
+	}
 	const data = await OrgService.getWithFeatures({
 		db: ctx.db,
 		orgId: orgId,
diff --git a/server/src/internal/mainRouter.ts b/server/src/internal/mainRouter.ts
index 24f1158ab..be95ddffc 100644
--- a/server/src/internal/mainRouter.ts
+++ b/server/src/internal/mainRouter.ts
@@ -115,6 +115,8 @@ mainRouter.use(
 					cookie: req.headers.cookie,
 					"Content-Type": "application/json",
 					origin: req.get("origin"),
+					"x-client-type": "dashboard",
+					app_env: req.env || req.headers.app_env,
 				},
 			});
 			return client as any;