diff --git a/app/services/order_fees_handler.rb b/app/services/order_fees_handler.rb
index f05351aec7..47be2c9903 100644
--- a/app/services/order_fees_handler.rb
+++ b/app/services/order_fees_handler.rb
@@ -21,7 +21,7 @@ class OrderFeesHandler
       create_order_fees!
     end
 
-    tax_enterprise_fees!
+    tax_enterprise_fees! unless order.before_payment_state?
     order.update_order!
   end