diff --git a/src/components/orders/OrderDetailPanel.jsx b/src/components/orders/OrderDetailPanel.jsx
index 7753097..d3958a1 100644
--- a/src/components/orders/OrderDetailPanel.jsx
+++ b/src/components/orders/OrderDetailPanel.jsx
@@ -710,17 +710,18 @@ export const OrderDetailPanel = ({
 
         {(() => {
           const isPickup = isPickupOrder;
+          const effectiveAddress = isPickup
+            ? (order.customerAddress || "")
+            : (order.deliveryAddress || "");
+          const requiresAddress = (order.deliveryStatus === "requires_address" || order.delivery_status === "requires_address") && !effectiveAddress;
           const deliveryTypeLabel = isPickup
             ? "Самовывоз"
-            : (order.deliveryStatus === "requires_address" || order.delivery_status === "requires_address")
+            : requiresAddress
               ? "Доставка (требуется адрес)"
               : "Доставка";
           const dateLabel = isPickup ? "Дата самовывоза" : "Дата доставки";
           const timeLabel = isPickup ? "Время самовывоза" : "Время доставки";
           const addressLabel = isPickup ? "Адрес клиента" : "Адрес доставки";
-          const effectiveAddress = isPickup
-            ? (order.customerAddress || "")
-            : (order.deliveryAddress || "");
           return (
         <div className="grid gap-3 rounded-[24px] border border-[var(--color-border)] bg-[var(--color-surface-strong)] p-4 md:grid-cols-4">
           <div>
@@ -740,7 +741,7 @@ export const OrderDetailPanel = ({
               Тип
             </p>
             <p className="mt-1 text-base font-medium !text-[var(--color-text)]">{deliveryTypeLabel}</p>
-            {(order.deliveryStatus === "requires_address" || order.delivery_status === "requires_address") && (
+            {requiresAddress && (
               <div className="mt-2 flex items-start gap-2 rounded-xl border border-[rgba(239,68,68,0.3)] bg-[rgba(239,68,68,0.08)] p-3">
                 <span className="text-lg">📍</span>
                 <div>