diff --git a/apps/web/components/orders/order-form/index.tsx b/apps/web/components/orders/order-form/index.tsx
index 68ed8b3..92f1bca 100644
--- a/apps/web/components/orders/order-form/index.tsx
+++ b/apps/web/components/orders/order-form/index.tsx
@@ -27,13 +27,17 @@ function getStepComponent(step: string) {
   return STEP_COMPONENTS[step] ?? null;
 }
 
-const BUTTON_COMPONENTS: Record<string, JSX.Element> = {
-  '': <NextButton />,
+const BUTTON_COMPONENTS: Record<string, JSX.Element | null> = {
+  'client-select': <NextButton />,
   'datetime-select': <SubmitButton />,
+  error: null,
+  'master-select': <NextButton />,
+  'service-select': <NextButton />,
+  success: null,
 };
 
 function getButtonComponent(step: string) {
-  return BUTTON_COMPONENTS[step] ?? <NextButton />;
+  return BUTTON_COMPONENTS[step];
 }
 
 export const OrderForm = withContext(OrderStoreProvider)(function () {