diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/pages/(detail)/[pageId]/page.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/pages/(detail)/[pageId]/page.tsx
index cbd500273..8c96f2bcf 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/pages/(detail)/[pageId]/page.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/pages/(detail)/[pageId]/page.tsx
@@ -26,8 +26,10 @@ const PageDetailsPage = observer(() => {
 
   // fetch page details
   const { error: pageDetailsError } = useSWR(
-    pageId ? `PAGE_DETAILS_${pageId}` : null,
-    pageId ? () => getPageById(workspaceSlug?.toString(), projectId?.toString(), pageId.toString()) : null,
+    workspaceSlug && projectId && pageId ? `PAGE_DETAILS_${pageId}` : null,
+    workspaceSlug && projectId && pageId
+      ? () => getPageById(workspaceSlug?.toString(), projectId?.toString(), pageId.toString())
+      : null,
     {
       revalidateIfStale: false,
       revalidateOnFocus: false,
diff --git a/web/core/components/pages/pages-list-view.tsx b/web/core/components/pages/pages-list-view.tsx
index abcd06298..7b106a458 100644
--- a/web/core/components/pages/pages-list-view.tsx
+++ b/web/core/components/pages/pages-list-view.tsx
@@ -19,8 +19,8 @@ export const PagesListView: React.FC<TPageView> = observer((props) => {
   const { isAnyPageAvailable, getAllPages } = useProjectPages();
   // fetching pages list
   useSWR(
-    projectId ? `PROJECT_PAGES_${projectId}` : null,
-    projectId ? () => getAllPages(workspaceSlug, projectId, pageType) : null
+    workspaceSlug && projectId && pageType ? `PROJECT_PAGES_${projectId}` : null,
+    workspaceSlug && projectId && pageType ? () => getAllPages(workspaceSlug, projectId, pageType) : null
   );
 
   // pages loader