diff --git a/web/app/(commonLayout)/datasets/layout.tsx b/web/app/(commonLayout)/datasets/layout.tsx
index ca70870b15..993f6ab1dd 100644
--- a/web/app/(commonLayout)/datasets/layout.tsx
+++ b/web/app/(commonLayout)/datasets/layout.tsx
@@ -9,16 +9,15 @@ import { useRouter } from '@/next/navigation'
 export default function DatasetsLayout({ children }: { children: React.ReactNode }) {
   const { isCurrentWorkspaceEditor, isCurrentWorkspaceDatasetOperator, currentWorkspace, isLoadingCurrentWorkspace } = useAppContext()
   const router = useRouter()
-  const shouldRedirect = !isLoadingCurrentWorkspace
-    && currentWorkspace.id
-    && !(isCurrentWorkspaceEditor || isCurrentWorkspaceDatasetOperator)
+  const isWorkspaceReady = !isLoadingCurrentWorkspace && !!currentWorkspace.id
+  const shouldRedirect = isWorkspaceReady && !(isCurrentWorkspaceEditor || isCurrentWorkspaceDatasetOperator)
 
   useEffect(() => {
     if (shouldRedirect)
       router.replace('/apps')
   }, [shouldRedirect, router])
 
-  if (shouldRedirect) {
+  if (!isWorkspaceReady || shouldRedirect) {
     return null
   }