diff --git a/src/pages/DataSamplesPage.tsx b/src/pages/DataSamplesPage.tsx
index bcca9af71..2f09504dc 100644
--- a/src/pages/DataSamplesPage.tsx
+++ b/src/pages/DataSamplesPage.tsx
@@ -52,15 +52,15 @@ const DataSamplesPage = () => {
   const actions = useStore((s) => s.actions);
   const addNewAction = useStore((s) => s.addNewAction);
   const model = useStore((s) => s.model);
-  const newSession = useStore((s) => s.newSession);
+  const projectId = useStore((s) => s.id);
   const [selectedActionIdx, setSelectedActionIdx] = useState<number>(0);
   const navigate = useNavigate();
 
   useEffect(() => {
-    if (!projectSessionStorage.getProjectId()) {
+    if (!projectSessionStorage.getProjectId() || !projectId) {
       return navigate(createHomePageUrl());
     }
-  }, [navigate, newSession]);
+  }, [navigate, projectId]);
 
   const trainModelFlowStart = useStore((s) => s.trainModelFlowStart);
 
@@ -94,7 +94,6 @@ const DataSamplesPage = () => {
   const welcomeDialogDismissedForProject = useStore(
     (s) => s.welcomeDialogDismissedForProject
   );
-  const projectId = useStore((s) => s.id);
   const dismissWelcomeDialog = useStore((s) => s.dismissWelcomeDialog);
   const isWelcomeDialogOpen =
     !isConnected && welcomeDialogDismissedForProject !== projectId;