diff --git a/server/authjs-handler.ts b/server/authjs-handler.ts
index 967a380..0eece00 100644
--- a/server/authjs-handler.ts
+++ b/server/authjs-handler.ts
@@ -41,6 +41,12 @@ const authjsConfig = {
   trustHost: true,
   // TODO: Replace secret {@see https://authjs.dev/reference/core#secret}
   secret: "buginoo",
+  /** Needed to specify cookie name because for some reason in production it
+   * wasn't reading the correct cookie but in development it was. So we need to
+   * make sure both development and production are using the same cookie name.*/
+  cookies: {
+    state: { name: "__Secure-authjs.session-token" },
+  },
   providers: [
     // TODO: Choose and implement providers
     // CredentialsProvider({
diff --git a/server/trpc-handler.ts b/server/trpc-handler.ts
index 1ee0a7c..276f4ab 100644
--- a/server/trpc-handler.ts
+++ b/server/trpc-handler.ts
@@ -25,7 +25,11 @@ export const trpcHandler = ((endpoint) => (request, context, runtime) => {
       const openrouter = getOpenrouter(
         (env.OPENROUTER_API_KEY || processEnv.OPENROUTER_API_KEY) as string
       );
-      const jwt = await getToken({ req: request, secret: "buginoo" });
+      const jwt = await getToken({
+        req,
+        secret: "buginoo",
+        cookieName: "__Secure-authjs.session-token",
+      });
       return {
         ...context,
         ...runtime,