diff --git a/apps/web/components/orders/components/contacts-grid.tsx b/apps/web/components/orders/components/contacts-grid.tsx
index c8b166d..ed2b800 100644
--- a/apps/web/components/orders/components/contacts-grid.tsx
+++ b/apps/web/components/orders/components/contacts-grid.tsx
@@ -17,22 +17,22 @@ export function ContactsGrid() {
 
   if (isLoading) return <LoadingSpinner />;
 
+  function handleOnSelect(contactId: string) {
+    setSelected(contactId);
+  }
+
   return (
     <div className="grid grid-cols-4 gap-4">
       {contacts.map((contact) => {
         if (!contact) return null;
 
         return (
-          <Label
-            className="flex cursor-pointer flex-col items-center"
-            key={contact?.documentId}
-            onClick={() => setSelected(contact?.documentId)}
-          >
+          <Label className="flex cursor-pointer flex-col items-center" key={contact?.documentId}>
             <input
               checked={selected === contact?.documentId}
               className="hidden"
               name="user"
-              onChange={() => setSelected(contact?.documentId)}
+              onChange={() => handleOnSelect(contact?.documentId)}
               type="radio"
               value={contact?.documentId}
             />
diff --git a/apps/web/components/orders/components/submit-button.tsx b/apps/web/components/orders/components/submit-button.tsx
index e494b07..8ca1c44 100644
--- a/apps/web/components/orders/components/submit-button.tsx
+++ b/apps/web/components/orders/components/submit-button.tsx
@@ -4,7 +4,7 @@ import { Button } from '@repo/ui/components/ui/button';
 import { use } from 'react';
 
 export function SubmitButton() {
-  const { nextStep, step } = use(OrderContext);
+  const { customerId, nextStep, step } = use(OrderContext);
 
   function handleOnClick() {
     if (step !== 'success') {
@@ -12,8 +12,10 @@ export function SubmitButton() {
     }
   }
 
+  const disabled = step === 'customer-select' && !customerId;
+
   return (
-    <Button className="w-full" onClick={() => handleOnClick()} type="button">
+    <Button className="w-full" disabled={disabled} onClick={() => handleOnClick()} type="button">
       {step === 'success' ? 'Создать' : 'Продолжить'}
     </Button>
   );