diff --git a/apps/dashboard/src/app/(dashboard)/dashboard/connect/in-app-wallets/PageHeader.tsx b/apps/dashboard/src/app/(dashboard)/dashboard/connect/in-app-wallets/PageHeader.tsx
new file mode 100644
index 00000000000..593b8e1fe8a
--- /dev/null
+++ b/apps/dashboard/src/app/(dashboard)/dashboard/connect/in-app-wallets/PageHeader.tsx
@@ -0,0 +1,24 @@
+import { TrackedLinkTW } from "@/components/ui/tracked-link";
+
+export function PageHeader() {
+  return (
+    <div>
+      <h1 className="font-semibold text-3xl tracking-tigher">In-App Wallets</h1>
+      <div className="h-3" />
+      <p className="max-w-[500px] text-muted-foreground ">
+        A wallet infrastructure that enables apps to create, manage, and control
+        their users wallets. Email login, social login, and bring-your-own auth
+        supported.{" "}
+        <TrackedLinkTW
+          target="_blank"
+          href="https://portal.thirdweb.com/connect/in-app-wallet/overview"
+          label="learn-more"
+          category="embedded-wallet"
+          className="text-link-foreground hover:text-foreground"
+        >
+          Learn more
+        </TrackedLinkTW>
+      </p>
+    </div>
+  );
+}
diff --git a/apps/dashboard/src/app/(dashboard)/dashboard/connect/in-app-wallets/[clientId]/page.tsx b/apps/dashboard/src/app/(dashboard)/dashboard/connect/in-app-wallets/[clientId]/page.tsx
new file mode 100644
index 00000000000..2b928b9944f
--- /dev/null
+++ b/apps/dashboard/src/app/(dashboard)/dashboard/connect/in-app-wallets/[clientId]/page.tsx
@@ -0,0 +1,50 @@
+import { redirect } from "next/navigation";
+import { EmbeddedWallets } from "../../../../../../components/embedded-wallets";
+import { getAuthToken } from "../../../../../api/lib/getAuthToken";
+import { PageHeader } from "../PageHeader";
+import { getInAppWalletSupportedAPIKeys } from "../getInAppWalletSupportedAPIKeys";
+import { InAppWalletsAPIKeysMenu } from "../inAppWalletsAPIKeysMenu";
+
+export default async function Page(props: {
+  params: {
+    clientId: string;
+  };
+  searchParams: {
+    tab?: string;
+  };
+}) {
+  const authToken = getAuthToken();
+  const { clientId } = props.params;
+
+  if (!authToken) {
+    redirect(
+      `/login?next=${encodeURIComponent(`/dashboard/connect/in-app-wallets/${clientId}`)}`,
+    );
+  }
+
+  const apiKeys = await getInAppWalletSupportedAPIKeys();
+  const apiKey = apiKeys.find((key) => key.key === clientId);
+
+  if (!apiKey) {
+    redirect("/dashboard/connect/in-app-wallets");
+  }
+
+  return (
+    <div>
+      {/* header */}
+      <div className="flex flex-col gap-4 lg:flex-row lg:justify-between">
+        <PageHeader />
+        <div>
+          <InAppWalletsAPIKeysMenu apiKeys={apiKeys} selectedAPIKey={apiKey} />
+        </div>
+      </div>
+
+      <div className="h-8" />
+      <EmbeddedWallets
+        apiKey={apiKey}
+        trackingCategory="embedded-wallet"
+        defaultTab={props.searchParams.tab === "1" ? 1 : 0}
+      />
+    </div>
+  );
+}
diff --git a/apps/dashboard/src/app/(dashboard)/dashboard/connect/in-app-wallets/getInAppWalletSupportedAPIKeys.ts b/apps/dashboard/src/app/(dashboard)/dashboard/connect/in-app-wallets/getInAppWalletSupportedAPIKeys.ts
new file mode 100644
index 00000000000..5c8454b4235
--- /dev/null
+++ b/apps/dashboard/src/app/(dashboard)/dashboard/connect/in-app-wallets/getInAppWalletSupportedAPIKeys.ts
@@ -0,0 +1,7 @@
+import { getApiKeys } from "../../../../api/lib/getAPIKeys";
+
+export async function getInAppWalletSupportedAPIKeys() {
+  return (await getApiKeys()).filter((key) => {
+    return !!(key.services || []).find((srv) => srv.name === "embeddedWallets");
+  });
+}
diff --git a/apps/dashboard/src/app/(dashboard)/dashboard/connect/in-app-wallets/inAppWalletsAPIKeysMenu.tsx b/apps/dashboard/src/app/(dashboard)/dashboard/connect/in-app-wallets/inAppWalletsAPIKeysMenu.tsx
new file mode 100644
index 00000000000..9d1ee930bcf
--- /dev/null
+++ b/apps/dashboard/src/app/(dashboard)/dashboard/connect/in-app-wallets/inAppWalletsAPIKeysMenu.tsx
@@ -0,0 +1,21 @@
+"use client";
+
+import { useDashboardRouter } from "@/lib/DashboardRouter";
+import type { ApiKey } from "@3rdweb-sdk/react/hooks/useApi";
+import { ApiKeysMenu } from "../../../../../components/settings/ApiKeys/Menu";
+
+export function InAppWalletsAPIKeysMenu(props: {
+  apiKeys: Pick<ApiKey, "name" | "key">[];
+  selectedAPIKey: Pick<ApiKey, "name" | "key">;
+}) {
+  const router = useDashboardRouter();
+  return (
+    <ApiKeysMenu
+      apiKeys={props.apiKeys}
+      selectedKey={props.selectedAPIKey}
+      onSelect={(key) => {
+        router.push(`/dashboard/connect/in-app-wallets/${key.key}`);
+      }}
+    />
+  );
+}
diff --git a/apps/dashboard/src/app/(dashboard)/dashboard/connect/in-app-wallets/layout.tsx b/apps/dashboard/src/app/(dashboard)/dashboard/connect/in-app-wallets/layout.tsx
new file mode 100644
index 00000000000..2c9758c30e2
--- /dev/null
+++ b/apps/dashboard/src/app/(dashboard)/dashboard/connect/in-app-wallets/layout.tsx
@@ -0,0 +1,17 @@
+import { AnalyticsCallout } from "../../../../team/[team_slug]/[project_slug]/connect/in-app-wallets/_components/AnalyticsCallout";
+import { InAppWaletFooterSection } from "../../../../team/[team_slug]/[project_slug]/connect/in-app-wallets/_components/footer";
+
+export default function Layout(props: {
+  children: React.ReactNode;
+}) {
+  return (
+    <div>
+      {props.children}
+      <div className="h-16" />
+      {/* Footer */}
+      <AnalyticsCallout trackingCategory="embedded-wallet" />
+      <div className="h-5" />
+      <InAppWaletFooterSection trackingCategory="embedded-wallet" />
+    </div>
+  );
+}
diff --git a/apps/dashboard/src/app/(dashboard)/dashboard/connect/in-app-wallets/page.tsx b/apps/dashboard/src/app/(dashboard)/dashboard/connect/in-app-wallets/page.tsx
new file mode 100644
index 00000000000..c4d75d74e9c
--- /dev/null
+++ b/apps/dashboard/src/app/(dashboard)/dashboard/connect/in-app-wallets/page.tsx
@@ -0,0 +1,30 @@
+import { redirect } from "next/navigation";
+import { NoApiKeys } from "../../../../../components/settings/ApiKeys/NoApiKeys";
+import { getAuthToken } from "../../../../api/lib/getAuthToken";
+import { PageHeader } from "./PageHeader";
+import { getInAppWalletSupportedAPIKeys } from "./getInAppWalletSupportedAPIKeys";
+
+export default async function Page() {
+  const authToken = getAuthToken();
+
+  if (!authToken) {
+    redirect(
+      `/login?next=${encodeURIComponent("/dashboard/connect/in-app-wallets")}`,
+    );
+  }
+
+  const apiKeys = await getInAppWalletSupportedAPIKeys();
+  const firstKey = apiKeys[0];
+
+  if (firstKey) {
+    redirect(`/dashboard/connect/in-app-wallets/${firstKey.key}`);
+  }
+
+  return (
+    <div>
+      <PageHeader />
+      <div className="h-8" />
+      <NoApiKeys service="in-app wallets" />
+    </div>
+  );
+}
diff --git a/apps/dashboard/src/components/embedded-wallets/index.tsx b/apps/dashboard/src/components/embedded-wallets/index.tsx
index 8f292be8898..6c6ce2a84c3 100644
--- a/apps/dashboard/src/components/embedded-wallets/index.tsx
+++ b/apps/dashboard/src/components/embedded-wallets/index.tsx
@@ -2,7 +2,6 @@
 
 import { TabButtons } from "@/components/ui/tabs";
 import type { ApiKey } from "@3rdweb-sdk/react/hooks/useApi";
-import { useSearchParams } from "next/navigation";
 import { useState } from "react";
 import { InAppWalletSettingsPage } from "./Configure";
 import { InAppWalletUsersPageContent } from "./Users";
@@ -19,16 +18,16 @@ interface EmbeddedWalletsProps {
     | "key"
   >;
   trackingCategory: string;
+  defaultTab: 0 | 1;
 }
 
 export const EmbeddedWallets: React.FC<EmbeddedWalletsProps> = ({
   apiKey,
   trackingCategory,
+  defaultTab,
 }) => {
-  const searchParams = useSearchParams();
-  const defaultTabIndex = searchParams?.get("tab") === "1" ? 1 : 0;
   const [selectedTab, setSelectedTab] = useState<"users" | "config">(
-    defaultTabIndex === 0 ? "users" : "config",
+    defaultTab === 0 ? "users" : "config",
   );
 
   function updateSearchParams(value: string) {
diff --git a/apps/dashboard/src/page-id.ts b/apps/dashboard/src/page-id.ts
index 02ee6d12492..dd488d90025 100644
--- a/apps/dashboard/src/page-id.ts
+++ b/apps/dashboard/src/page-id.ts
@@ -98,8 +98,6 @@ export enum PageId {
 
   // thirdweb.com/dashboard/connect/smart-wallet
   DashboardConnectAccountAbstraction = "dashboard-wallets-smart-wallet",
-  // thirdweb.com/dashboard/connect/embedded
-  DashboardConnectEmbeddedWallets = "dashboard-wallets-embedded",
   // thirdweb.com/dashboard/contracts/build
   DashboardContractsBuild = "dashboard-contracts-build",
 
diff --git a/apps/dashboard/src/pages/dashboard/connect/in-app-wallets.tsx b/apps/dashboard/src/pages/dashboard/connect/in-app-wallets.tsx
deleted file mode 100644
index 8176ac64831..00000000000
--- a/apps/dashboard/src/pages/dashboard/connect/in-app-wallets.tsx
+++ /dev/null
@@ -1,137 +0,0 @@
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { TrackedLinkTW } from "@/components/ui/tracked-link";
-import { type ApiKey, useApiKeys } from "@3rdweb-sdk/react/hooks/useApi";
-import { useLoggedInUser } from "@3rdweb-sdk/react/hooks/useLoggedInUser";
-import { AppLayout } from "components/app-layouts/app";
-import { EmbeddedWallets } from "components/embedded-wallets";
-import { ApiKeysMenu } from "components/settings/ApiKeys/Menu";
-import { NoApiKeys } from "components/settings/ApiKeys/NoApiKeys";
-// import { ConnectSidebar } from "core-ui/sidebar/connect";
-import { useRouter } from "next/router";
-import { PageId } from "page-id";
-import { useMemo, useState } from "react";
-import type { ThirdwebNextPage } from "utils/types";
-import { ConnectSidebarLayout } from "../../../app/(dashboard)/dashboard/connect/DashboardConnectLayout";
-import { AnalyticsCallout } from "../../../app/team/[team_slug]/[project_slug]/connect/in-app-wallets/_components/AnalyticsCallout";
-import { InAppWaletFooterSection } from "../../../app/team/[team_slug]/[project_slug]/connect/in-app-wallets/_components/footer";
-
-const TRACKING_CATEGORY = "embedded-wallet";
-
-const DashboardConnectEmbeddedWallets: ThirdwebNextPage = () => {
-  const router = useRouter();
-  const defaultClientId = router.query.clientId?.toString();
-  const { isPending } = useLoggedInUser();
-  const keysQuery = useApiKeys();
-
-  const [selectedKey_, setSelectedKey] = useState<undefined | ApiKey>();
-
-  const apiKeys = useMemo(() => {
-    return (keysQuery?.data || []).filter((key) => {
-      return !!(key.services || []).find(
-        (srv) => srv.name === "embeddedWallets",
-      );
-    });
-  }, [keysQuery]);
-
-  const hasApiKeys = apiKeys.length > 0;
-
-  // compute the actual selected key based on if there is a state, if there is a query param, or otherwise the first one
-  const selectedKey = useMemo(() => {
-    if (selectedKey_) {
-      return selectedKey_;
-    }
-    if (apiKeys.length) {
-      if (defaultClientId) {
-        return apiKeys.find((k) => k.key === defaultClientId);
-      }
-      return apiKeys[0];
-    }
-    return undefined;
-  }, [apiKeys, defaultClientId, selectedKey_]);
-
-  if (isPending) {
-    return (
-      <div className="grid w-full place-items-center">
-        <Spinner className="size-14" />
-      </div>
-    );
-  }
-
-  return (
-    <div>
-      <div className="flex flex-col gap-4 lg:flex-row lg:justify-between">
-        <div>
-          <h1 className="font-semibold text-3xl tracking-tigher">
-            In-App Wallets
-          </h1>
-
-          <div className="h-3" />
-
-          <p className="max-w-[500px] text-muted-foreground ">
-            A wallet infrastructure that enables apps to create, manage, and
-            control their users wallets. Email login, social login, and
-            bring-your-own auth supported.{" "}
-            <TrackedLinkTW
-              target="_blank"
-              href="https://portal.thirdweb.com/connect/in-app-wallet/overview"
-              label="learn-more"
-              category={TRACKING_CATEGORY}
-              className="text-link-foreground hover:text-foreground"
-            >
-              Learn more
-            </TrackedLinkTW>
-          </p>
-        </div>
-
-        <div>
-          {hasApiKeys && selectedKey && (
-            <ApiKeysMenu
-              apiKeys={apiKeys}
-              selectedKey={selectedKey}
-              onSelect={setSelectedKey}
-            />
-          )}
-        </div>
-      </div>
-
-      <div className="h-8" />
-
-      {keysQuery.isPending ? (
-        <div className="flex h-[500px] items-center justify-center">
-          <Spinner className="size-10" />
-        </div>
-      ) : (
-        <>
-          {!hasApiKeys && <NoApiKeys service="in-app wallets" />}
-
-          {hasApiKeys && selectedKey && (
-            <EmbeddedWallets
-              apiKey={selectedKey}
-              trackingCategory={TRACKING_CATEGORY}
-            />
-          )}
-        </>
-      )}
-
-      <div className="h-16" />
-      <AnalyticsCallout trackingCategory={TRACKING_CATEGORY} />
-      <div className="h-5" />
-
-      <InAppWaletFooterSection trackingCategory={TRACKING_CATEGORY} />
-    </div>
-  );
-};
-
-DashboardConnectEmbeddedWallets.getLayout = (page, props) => (
-  <AppLayout
-    {...props}
-    pageContainerClassName="!max-w-full !px-0"
-    mainClassName="!pt-0"
-  >
-    <ConnectSidebarLayout>{page}</ConnectSidebarLayout>
-  </AppLayout>
-);
-
-DashboardConnectEmbeddedWallets.pageId = PageId.DashboardConnectEmbeddedWallets;
-
-export default DashboardConnectEmbeddedWallets;