diff --git a/src/features/onboarding/onboarding-shell.tsx b/src/features/onboarding/onboarding-shell.tsx
index 74a9964a..ddc823bc 100644
--- a/src/features/onboarding/onboarding-shell.tsx
+++ b/src/features/onboarding/onboarding-shell.tsx
@@ -50,6 +50,12 @@ export const OnboardingShell = () => {
                 let prevId = STEP_ORDER[currentIndex - 1];
                 if (currentStepId === "project-create") {
                   prevId = "agent-create";
+                } else if (currentStepId === "agent-create") {
+                  const notifiers = (state.context.flowData.notifiers as unknown[]) || [];
+                  const storages = (state.context.flowData.storages as unknown[]) || [];
+                  if (notifiers.length === 0 && storages.length === 0) {
+                    prevId = "storage";
+                  }
                 }
                 if (prevId) goToStep(prevId);
               }}