diff --git a/frontend/src/components/OnboardingSteps/FolderSetupStep.tsx b/frontend/src/components/OnboardingSteps/FolderSetupStep.tsx
index aa5cb715..f5361d9f 100644
--- a/frontend/src/components/OnboardingSteps/FolderSetupStep.tsx
+++ b/frontend/src/components/OnboardingSteps/FolderSetupStep.tsx
@@ -58,7 +58,9 @@ export function FolderSetupStep({
 
   const handleNext = () => {
     localStorage.setItem('folderChosen', 'true');
-    addFolderMutate(folder);
+    if (folder) {
+      addFolderMutate(folder);
+    }
     dispatch(markCompleted(stepIndex));
   };