diff --git a/src/QUI/ERP/Shipping/EventHandler.php b/src/QUI/ERP/Shipping/EventHandler.php
index b615467e39b20348dd87ba02f0036ec483c4e419..9143647470c95beea814be3b4e75aef940307986 100644
--- a/src/QUI/ERP/Shipping/EventHandler.php
+++ b/src/QUI/ERP/Shipping/EventHandler.php
@@ -215,10 +215,11 @@ public static function onQuiqqerOrderCustomerDataSave(
         try {
             $Address = $User->getAddress($_REQUEST['shipping-address']);
         } catch (QUI\Exception $Exception) {
+            $Order->clearAddressDelivery();
+            $Order->save();
             return;
         }
 
-
         $ErpAddress = new QUI\ERP\Address(
             \array_merge($Address->getAttributes(), ['id' => $Address->getId()])
         );