diff --git a/apps/web/components/orders/order-form/submit-button.tsx b/apps/web/components/orders/order-form/submit-button.tsx
index 94b399b..dbfb398 100644
--- a/apps/web/components/orders/order-form/submit-button.tsx
+++ b/apps/web/components/orders/order-form/submit-button.tsx
@@ -4,7 +4,7 @@ import { useOrderCreate } from '@/hooks/api/orders';
 import { useOrderStore } from '@/stores/order';
 import { Button } from '@repo/ui/components/ui/button';
 import { LoadingSpinner } from '@repo/ui/components/ui/spinner';
-import { formatDate, formatTime } from '@repo/utils/datetime-format';
+import { formatTime } from '@repo/utils/datetime-format';
 import { useEffect } from 'react';
 
 export function SubmitButton() {
@@ -19,7 +19,6 @@ export function SubmitButton() {
     createOrder({
       input: {
         client: clientId,
-        date: formatDate(date).db(),
         services: [serviceId],
         slot: slotId,
         time_start: formatTime(time).db(),
diff --git a/apps/web/hooks/api/orders.ts b/apps/web/hooks/api/orders.ts
index 48178af..2b8bce1 100644
--- a/apps/web/hooks/api/orders.ts
+++ b/apps/web/hooks/api/orders.ts
@@ -15,8 +15,16 @@ export const useOrderCreate = () => {
   return useMutation({
     mutationFn: createOrder,
     mutationKey: ['order', 'create'],
-    onSuccess: () => {
+    onSuccess: (data) => {
       queryClient.invalidateQueries({ queryKey: ['orders'] });
+
+      const documentId = data?.createOrder?.documentId;
+
+      if (documentId)
+        queryClient.prefetchQuery({
+          queryFn: () => getOrder({ documentId }),
+          queryKey: ['order', documentId],
+        });
     },
   });
 };
diff --git a/packages/graphql/api/orders.ts b/packages/graphql/api/orders.ts
index f6fccbb..ccd5361 100644
--- a/packages/graphql/api/orders.ts
+++ b/packages/graphql/api/orders.ts
@@ -75,10 +75,9 @@ export class OrdersService extends BaseService {
     const mutationResult = await mutate({
       mutation: GQL.CreateOrderDocument,
       variables: {
+        ...variables,
         input: {
-          client: variables.input.client,
-          services: variables.input.services,
-          slot: variables.input.slot,
+          ...variables.input,
           time_end: formatTime(endTime).db(),
         },
       },