diff --git a/apps/dashboard/src/app/nebula-app/(app)/chat/[session_id]/page.tsx b/apps/dashboard/src/app/nebula-app/(app)/chat/[session_id]/page.tsx
index eed3ca905c3..703f0018778 100644
--- a/apps/dashboard/src/app/nebula-app/(app)/chat/[session_id]/page.tsx
+++ b/apps/dashboard/src/app/nebula-app/(app)/chat/[session_id]/page.tsx
@@ -1,6 +1,9 @@
 import { redirect } from "next/navigation";
 import { loginRedirect } from "../../../../(app)/login/loginRedirect";
-import { getNebulaAuthToken } from "../../../_utils/authToken";
+import {
+  getNebulaAuthToken,
+  getNebulaAuthTokenWalletAddress,
+} from "../../../_utils/authToken";
 import { getSessionById } from "../../api/session";
 import { ChatPageContent } from "../../components/ChatPageContent";
 
@@ -12,8 +15,9 @@ export default async function Page(props: {
   const params = await props.params;
   const pagePath = `/chat/${params.session_id}`;
   const authToken = await getNebulaAuthToken();
+  const accountAddress = await getNebulaAuthTokenWalletAddress();
 
-  if (!authToken) {
+  if (!authToken || !accountAddress) {
     loginRedirect(pagePath);
   }
 
@@ -28,6 +32,7 @@ export default async function Page(props: {
 
   return (
     <ChatPageContent
+      accountAddress={accountAddress}
       authToken={authToken}
       session={session}
       type="new-chat"
diff --git a/apps/dashboard/src/app/nebula-app/(app)/chat/page.tsx b/apps/dashboard/src/app/nebula-app/(app)/chat/page.tsx
index d1c4ad41d65..7a9fee59956 100644
--- a/apps/dashboard/src/app/nebula-app/(app)/chat/page.tsx
+++ b/apps/dashboard/src/app/nebula-app/(app)/chat/page.tsx
@@ -1,16 +1,23 @@
 import { loginRedirect } from "../../../(app)/login/loginRedirect";
-import { getNebulaAuthToken } from "../../_utils/authToken";
+import {
+  getNebulaAuthToken,
+  getNebulaAuthTokenWalletAddress,
+} from "../../_utils/authToken";
 import { ChatPageContent } from "../components/ChatPageContent";
 
 export default async function Page() {
-  const authToken = await getNebulaAuthToken();
+  const [authToken, accountAddress] = await Promise.all([
+    getNebulaAuthToken(),
+    getNebulaAuthTokenWalletAddress(),
+  ]);
 
-  if (!authToken) {
+  if (!authToken || !accountAddress) {
     loginRedirect();
   }
 
   return (
     <ChatPageContent
+      accountAddress={accountAddress}
       authToken={authToken}
       session={undefined}
       type="new-chat"
diff --git a/apps/dashboard/src/app/nebula-app/(app)/components/ChatPageContent.tsx b/apps/dashboard/src/app/nebula-app/(app)/components/ChatPageContent.tsx
index 723a33f2916..17b60e36336 100644
--- a/apps/dashboard/src/app/nebula-app/(app)/components/ChatPageContent.tsx
+++ b/apps/dashboard/src/app/nebula-app/(app)/components/ChatPageContent.tsx
@@ -29,6 +29,7 @@ import { EmptyStateChatPageContent } from "./EmptyStateChatPageContent";
 
 export function ChatPageContent(props: {
   session: SessionInfo | undefined;
+  accountAddress: string;
   authToken: string;
   type: "landing" | "new-chat";
   initialParams:
@@ -99,7 +100,7 @@ export function ChatPageContent(props: {
         contextRes?.chain_ids ||
         props.initialParams?.chainIds.map((x) => x.toString()) ||
         [],
-      walletAddress: contextRes?.wallet_address || null,
+      walletAddress: contextRes?.wallet_address || props.accountAddress || null,
     };
 
     return value;
diff --git a/apps/dashboard/src/app/nebula-app/(app)/page.tsx b/apps/dashboard/src/app/nebula-app/(app)/page.tsx
index c8cbe7f4a90..1e2bfae7891 100644
--- a/apps/dashboard/src/app/nebula-app/(app)/page.tsx
+++ b/apps/dashboard/src/app/nebula-app/(app)/page.tsx
@@ -1,5 +1,8 @@
 import { loginRedirect } from "../../(app)/login/loginRedirect";
-import { getNebulaAuthToken } from "../_utils/authToken";
+import {
+  getNebulaAuthToken,
+  getNebulaAuthTokenWalletAddress,
+} from "../_utils/authToken";
 import { ChatPageContent } from "./components/ChatPageContent";
 import { getChains } from "./utils/getChainIds";
 
@@ -11,17 +14,19 @@ export default async function Page(props: {
 }) {
   const searchParams = await props.searchParams;
 
-  const [chains, authToken] = await Promise.all([
+  const [chains, authToken, accountAddress] = await Promise.all([
     getChains(searchParams.chain),
     getNebulaAuthToken(),
+    getNebulaAuthTokenWalletAddress(),
   ]);
 
-  if (!authToken) {
+  if (!authToken || !accountAddress) {
     loginRedirect();
   }
 
   return (
     <ChatPageContent
+      accountAddress={accountAddress}
       authToken={authToken}
       session={undefined}
       type="landing"