diff --git a/shop/components/order-wizard.tsx b/shop/components/order-wizard.tsx
index bb60343..2bb00d4 100644
--- a/shop/components/order-wizard.tsx
+++ b/shop/components/order-wizard.tsx
@@ -241,10 +241,10 @@ export function OrderWizard({
   }, [categories, selectedBillingInterval])
 
   useEffect(() => {
-    if (visibleCategories.length > 0 && !visibleCategories.some(c => c.id === activeCategoryId)) {
+    if (step === 3 && visibleCategories.length > 0) {
       setActiveCategoryId(visibleCategories[0].id)
     }
-  }, [visibleCategories, activeCategoryId])
+  }, [step, visibleCategories])
 
   // Endkunden Filterung
   const filteredEndCustomers = useMemo(() => {