diff --git a/src/include/order/class-wc-retailcrm-order.php b/src/include/order/class-wc-retailcrm-order.php
index 69d529c..760f880 100644
--- a/src/include/order/class-wc-retailcrm-order.php
+++ b/src/include/order/class-wc-retailcrm-order.php
@@ -97,11 +97,18 @@ class WC_Retailcrm_Order extends WC_Retailcrm_Abstracts_Data
      */
     protected function set_number($order)
     {
+        if ($this->is_new) {
+            $this->set_data_field('number', $order->get_order_number());
+        }
+
         if (isset($this->settings['update_number'])
             && $this->settings['update_number'] == WC_Retailcrm_Base::YES
-            && !$this->is_new
         ) {
-            $this->set_data_field('number', $order->get_order_number());
+            if (!$this->is_new) {
+                $this->set_data_field('number', $order->get_order_number());
+            }
+        } elseif (!$this->is_new) {
+            unset($this->data['number']);
         }
     }