diff --git a/src/components/orders/OrderDetailPanel.jsx b/src/components/orders/OrderDetailPanel.jsx
index bb2f6b2..272d1a5 100644
--- a/src/components/orders/OrderDetailPanel.jsx
+++ b/src/components/orders/OrderDetailPanel.jsx
@@ -863,7 +863,7 @@ export const OrderDetailPanel = ({
             <p className="text-xs text-[var(--color-text-muted)]">{isPickupOrder ? "Статус самовывоза" : "Статус доставки"}</p>
             <p className="font-medium !text-[var(--color-text)]">{getOrderGroupDeliveryStatusLabel(order.deliveryStatus || order.delivery_status)}</p>
           </div>
-          {(order.pickupCode || order.pickup_code) ? (
+          {(order.pickupCode || order.pickup_code) && (order.deliveryType === "pickup" || order.delivery_type === "pickup") ? (
             <div>
               <p className="text-xs text-[var(--color-text-muted)]">Код выдачи</p>
               <p className="text-2xl font-bold tracking-[0.3em] text-[var(--color-accent)]">{order.pickupCode || order.pickup_code}</p>
diff --git a/src/services/supabase/orderGroupRepository.js b/src/services/supabase/orderGroupRepository.js
index 81d4359..ad119ca 100644
--- a/src/services/supabase/orderGroupRepository.js
+++ b/src/services/supabase/orderGroupRepository.js
@@ -293,16 +293,6 @@ export const updateOrderGroupDeliveryChoice = async ({
       updatePayload.pickup_time_slot = pickupTimeSlot || null;
       // Pickup orders don't need a driver — clear assignment
       updatePayload.assigned_driver_id = null;
-      // Generate pickup code if not already set
-      const { data: existing } = await client
-        .from("order_groups")
-        .select("pickup_code")
-        .eq("id", orderGroupId)
-        .single();
-      if (!existing?.pickup_code) {
-        const code = String(100000 + Math.floor(Math.random() * 900000));
-        updatePayload.pickup_code = code;
-      }
     } else {
       updatePayload.pickup_date = null;
       updatePayload.pickup_time_slot = null;
diff --git a/supabase/functions/confirm-delivery-choice/index.ts b/supabase/functions/confirm-delivery-choice/index.ts
index b8895d4..d83eadd 100644
--- a/supabase/functions/confirm-delivery-choice/index.ts
+++ b/supabase/functions/confirm-delivery-choice/index.ts
@@ -210,16 +210,6 @@ Deno.serve(async (request) => {
         groupUpdateData.pickup_time_slot = body.pickupTimeSlot || requestedSlot.deliveryTime || null;
         // Pickup orders don't need a driver — clear assignment
         groupUpdateData.assigned_driver_id = null;
-        // Generate pickup code if not already set
-        const { data: existingGroup } = await supabase
-          .from("order_groups")
-          .select("pickup_code")
-          .eq("id", invitation.order_group_id)
-          .single();
-        if (!existingGroup?.pickup_code) {
-          const code = String(100000 + Math.floor(Math.random() * 900000));
-          groupUpdateData.pickup_code = code;
-        }
       }
 
       const { error: groupUpdateError } = await supabase
diff --git a/supabase/functions/update-order-group-delivery-choice/index.ts b/supabase/functions/update-order-group-delivery-choice/index.ts
index 6271dca..0b6215b 100644
--- a/supabase/functions/update-order-group-delivery-choice/index.ts
+++ b/supabase/functions/update-order-group-delivery-choice/index.ts
@@ -175,11 +175,6 @@ Deno.serve(async (request) => {
       updateData.pickup_date = body.pickupDate || deliveryDate || null;
       updateData.pickup_time_slot = body.pickupTimeSlot || deliveryTime || null;
       updateData.assigned_driver_id = null;
-      // Generate pickup code if not already set
-      if (!currentGroup.pickup_code) {
-        const code = String(100000 + Math.floor(Math.random() * 900000));
-        updateData.pickup_code = code;
-      }
     } else {
       updateData.pickup_date = null;
       updateData.pickup_time_slot = null;