diff --git a/admin-spa/src/routes/Orders/partials/OrderForm.tsx b/admin-spa/src/routes/Orders/partials/OrderForm.tsx
index d0d9fff..092bed4 100644
--- a/admin-spa/src/routes/Orders/partials/OrderForm.tsx
+++ b/admin-spa/src/routes/Orders/partials/OrderForm.tsx
@@ -1266,7 +1266,12 @@ export default function OrderForm({
             {hasPhysicalProduct && (
               <div>
                 <Label>{__('Shipping method')}</Label>
-                {shippingLoading ? (
+                {!isShippingAddressComplete ? (
+                  /* Prompt user to enter address first */
+                  <div className="text-sm text-muted-foreground py-2 italic">
+                    {__('Enter shipping address to see available rates')}
+                  </div>
+                ) : shippingLoading ? (
                   <div className="text-sm text-muted-foreground py-2">{__('Calculating rates...')}</div>
                 ) : shippingRates?.methods && shippingRates.methods.length > 0 ? (
                   <Select value={shippingMethod} onValueChange={setShippingMethod}>
@@ -1279,21 +1284,9 @@ export default function OrderForm({
                       ))}
                     </SelectContent>
                   </Select>
-                ) : isShippingAddressComplete && effectiveShippingAddress.country ? (
-                  /* Address is complete but no methods returned - show message */
-                  <div className="text-sm text-muted-foreground py-2">{__('No shipping methods available for this address')}</div>
-                ) : shippings.length > 0 ? (
-                  /* Fallback to static list when address is not complete */
-                  <Select value={shippingMethod} onValueChange={setShippingMethod}>
-                    <SelectTrigger className="w-full"><SelectValue placeholder={__('Select shipping')} /></SelectTrigger>
-                    <SelectContent>
-                      {shippings.map(s => (
-                        <SelectItem key={s.id} value={s.id}>{s.title} {s.cost > 0 ? `- ${money(s.cost)}` : ''}</SelectItem>
-                      ))}
-                    </SelectContent>
-                  </Select>
                 ) : (
-                  <div className="text-sm text-muted-foreground py-2">{__('No shipping methods configured')}</div>
+                  /* Address is complete but no methods returned */
+                  <div className="text-sm text-muted-foreground py-2">{__('No shipping methods available for this address')}</div>
                 )}
               </div>
             )}