diff --git a/src/components/cost-estimator/cost-estimator-form.tsx b/src/components/cost-estimator/cost-estimator-form.tsx
index 69a21cd..90e078b 100644
--- a/src/components/cost-estimator/cost-estimator-form.tsx
+++ b/src/components/cost-estimator/cost-estimator-form.tsx
@@ -71,6 +71,8 @@ export function CostEstimatorForm() {
     startTransition(() => {
       if (currentStep === 2 && formData.serviceType === 'development') {
         setCurrentStep(5);
+      } else if (currentStep === 5 && formData.serviceType === 'development') {
+        setCurrentStep(9);
       } else {
         setCurrentStep((prev) => prev + 1);
       }
@@ -81,6 +83,8 @@ export function CostEstimatorForm() {
     startTransition(() => {
       if (currentStep === 5 && formData.serviceType === 'development') {
         setCurrentStep(2);
+      } else if (currentStep === 9 && formData.serviceType === 'development') {
+        setCurrentStep(5);
       } else {
         setCurrentStep((prev) => prev - 1);
       }