diff --git a/src/QUI/ERP/Shipping/EventHandler.php b/src/QUI/ERP/Shipping/EventHandler.php
index 40629499928c0c172f4a4b6ece1e6dde9fc90800..1c70508cb448144ea1a2b4090187df6c77c9e400 100644
--- a/src/QUI/ERP/Shipping/EventHandler.php
+++ b/src/QUI/ERP/Shipping/EventHandler.php
@@ -80,6 +80,10 @@ public static function onQuiqqerOrderBasketToOrderEnd(
         QUI\ERP\Order\AbstractOrder $Order,
         QUI\ERP\Products\Product\ProductList $Products
     ) {
+        if (Shipping::getInstance()->shippingDisabled()) {
+            return;
+        }
+        
         $Shipping = $Order->getShipping();
 
         if (!$Shipping) {
@@ -161,6 +165,10 @@ public static function onOrderProcessCustomerDataEnd(
         $Address,
         $Order
     ) {
+        if (Shipping::getInstance()->shippingDisabled()) {
+            return;
+        }
+
         $Control = new QUI\ERP\Shipping\Order\ShippingAddress([
             'User'  => $User,
             'Order' => $Order
@@ -178,6 +186,10 @@ public static function onOrderProcessCustomerDataEnd(
     public static function onQuiqqerOrderCustomerDataSave(
         QUI\ERP\Order\Controls\OrderProcess\CustomerData $CustomerData
     ) {
+        if (Shipping::getInstance()->shippingDisabled()) {
+            return;
+        }
+
         if (!isset($_REQUEST['shipping-address'])) {
             return;
         }
@@ -211,6 +223,10 @@ public static function onFrontendUsersAddressTop(
         Collector $Collector,
         QUI\Users\User $User
     ) {
+        if (Shipping::getInstance()->shippingDisabled()) {
+            return;
+        }
+
         $ShippingAddress = new QUI\ERP\Shipping\FrontendUsers\ShippingAddressSelect([
             'User' => $User
         ]);
@@ -223,6 +239,10 @@ public static function onFrontendUsersAddressTop(
      */
     public static function onUserSaveBegin(QUI\Users\User $User)
     {
+        if (Shipping::getInstance()->shippingDisabled()) {
+            return;
+        }
+
         $Request = QUI::getRequest()->request;
 
         $submit  = $Request->get('submit-shipping');