diff --git a/app/[locale]/dashboard/[entityType]/[entitySlug]/collaboratives/page.tsx b/app/[locale]/dashboard/[entityType]/[entitySlug]/collaboratives/page.tsx
index 2c9bab54..ca1aa781 100644
--- a/app/[locale]/dashboard/[entityType]/[entitySlug]/collaboratives/page.tsx
+++ b/app/[locale]/dashboard/[entityType]/[entitySlug]/collaboratives/page.tsx
@@ -89,7 +89,10 @@ export default function CollaborativePage() {
     ? { [entityType]: entitySlug }
     : null;
 
-  const [navigationTab, setNavigationTab] = useQueryState('tab', parseAsString);
+  const [navigationTab, setNavigationTab] = useQueryState(
+    'tab',
+    parseAsString.withDefault('drafts')
+  );
 
   const AllCollaboratives =
     useQuery(
@@ -110,12 +113,10 @@ export default function CollaborativePage() {
     );
 
   useEffect(() => {
-    if (navigationTab === null || navigationTab === undefined)
-      setNavigationTab('drafts');
     if (isValidParams) {
       AllCollaboratives.refetch();
     }
-  }, [navigationTab, isValidParams, AllCollaboratives, setNavigationTab]);
+  }, [navigationTab, isValidParams, AllCollaboratives]);
 
   const COLLAB_LIST_TOAST_ID = 'collaboratives-list-toast';
 
diff --git a/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/page.tsx b/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/page.tsx
index f80a4dd6..21c90f70 100644
--- a/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/page.tsx
+++ b/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/page.tsx
@@ -87,7 +87,10 @@ export default function DatasetPage() {
     ? { [entityType]: entitySlug }
     : null;
 
-  const [navigationTab, setNavigationTab] = useQueryState('tab', parseAsString);
+  const [navigationTab, setNavigationTab] = useQueryState(
+    'tab',
+    parseAsString.withDefault('drafts')
+  );
   const [isTypeModalOpen, setIsTypeModalOpen] = useState(false);
 
   const AllDatasetsQuery = useQuery(
@@ -111,12 +114,10 @@ export default function DatasetPage() {
     );
 
   useEffect(() => {
-    if (navigationTab === null || navigationTab === undefined)
-      setNavigationTab('drafts');
     if (isValidParams) {
       AllDatasetsQuery.refetch();
     }
-  }, [navigationTab, isValidParams, AllDatasetsQuery, setNavigationTab]);
+  }, [navigationTab, isValidParams, AllDatasetsQuery]);
 
   const DeleteDatasetMutation = useMutation(
     [`delete_dataset`],
diff --git a/app/[locale]/dashboard/[entityType]/[entitySlug]/usecases/page.tsx b/app/[locale]/dashboard/[entityType]/[entitySlug]/usecases/page.tsx
index 5a5285c0..548b9ec5 100644
--- a/app/[locale]/dashboard/[entityType]/[entitySlug]/usecases/page.tsx
+++ b/app/[locale]/dashboard/[entityType]/[entitySlug]/usecases/page.tsx
@@ -86,7 +86,10 @@ export default function DatasetPage() {
     ? { [entityType]: entitySlug }
     : null;
 
-  const [navigationTab, setNavigationTab] = useQueryState('tab', parseAsString);
+  const [navigationTab, setNavigationTab] = useQueryState(
+    'tab',
+    parseAsString.withDefault('drafts')
+  );
 
   const AllUseCases = useQuery(
     [`fetch_UseCases`, entityType, entitySlug, navigationTab ?? 'drafts'],
@@ -105,12 +108,10 @@ export default function DatasetPage() {
   );
 
   useEffect(() => {
-    if (navigationTab === null || navigationTab === undefined)
-      setNavigationTab('drafts');
     if (isValidParams) {
       AllUseCases.refetch();
     }
-  }, [navigationTab, isValidParams, setNavigationTab, AllUseCases]);
+  }, [navigationTab, isValidParams, AllUseCases]);
 
   const DeleteUseCaseMutation = useMutation(
     [`delete_Usecase`],