diff --git a/apps/client/src/features/space/components/sidebar/space-sidebar.tsx b/apps/client/src/features/space/components/sidebar/space-sidebar.tsx
index 4e75b9d1..ce52f5ca 100644
--- a/apps/client/src/features/space/components/sidebar/space-sidebar.tsx
+++ b/apps/client/src/features/space/components/sidebar/space-sidebar.tsx
@@ -73,14 +73,15 @@ export function SpaceSidebar() {
   const spaceRules = space?.membership?.permissions;
   const spaceAbility = useSpaceAbility(spaceRules);
 
+  // Acadenice R3.6 — template picker state (must be declared BEFORE any early
+  // return to keep React hook order stable across renders).
+  const [templatePickerOpened, { open: openTemplatePicker, close: closeTemplatePicker }] =
+    useDisclosure(false);
+
   if (!space) {
     return <></>;
   }
 
-  // Acadenice R3.6 — template picker state
-  const [templatePickerOpened, { open: openTemplatePicker, close: closeTemplatePicker }] =
-    useDisclosure(false);
-
   function handleCreatePage() {
     tree?.create({ parentId: null, type: "internal", index: 0 });
   }