diff --git a/apps/client/src/App.tsx b/apps/client/src/App.tsx
index 53de267c9..0c8b72f24 100644
--- a/apps/client/src/App.tsx
+++ b/apps/client/src/App.tsx
@@ -105,7 +105,7 @@ export default function App() {
             element={<Page />}
           />
 
-          <Route path={"/base/:baseId"} element={<BasePage />} />
+          <Route path={"/base/:pageId"} element={<BasePage />} />
 
           <Route path={"/settings"}>
             <Route path={"account/profile"} element={<AccountSettings />} />
diff --git a/apps/client/src/pages/base/base-page.tsx b/apps/client/src/pages/base/base-page.tsx
index fd54664ce..ef3c42baf 100644
--- a/apps/client/src/pages/base/base-page.tsx
+++ b/apps/client/src/pages/base/base-page.tsx
@@ -4,10 +4,10 @@ import { BaseTable } from "@/features/base/components/base-table";
 import { useBaseQuery } from "@/features/base/queries/base-query";
 
 export default function BasePage() {
-  const { baseId } = useParams<{ baseId: string }>();
-  const { data: base } = useBaseQuery(baseId);
+  const { pageId } = useParams<{ pageId: string }>();
+  const { data: base } = useBaseQuery(pageId);
 
-  if (!baseId) {
+  if (!pageId) {
     return (
       <Stack align="center" p="xl">
         <Text c="dimmed">No base ID provided</Text>
@@ -26,7 +26,7 @@ export default function BasePage() {
           {base.icon ? `${base.icon} ` : ""}{base.name}
         </Title>
       )}
-      <BaseTable baseId={baseId} />
+      <BaseTable pageId={pageId} />
     </Container>
   );
 }