diff --git a/app/services/letzshop/order_service.py b/app/services/letzshop/order_service.py
index 632bce2e..ffeca103 100644
--- a/app/services/letzshop/order_service.py
+++ b/app/services/letzshop/order_service.py
@@ -733,6 +733,7 @@ class LetzshopOrderService:
                             pass
 
                 if needs_update:
+                    self.db.commit()  # Commit update immediately
                     stats["updated"] += 1
                 else:
                     stats["skipped"] += 1
@@ -740,8 +741,10 @@ class LetzshopOrderService:
                 # Create new order using unified service
                 try:
                     self.create_order(vendor_id, shipment)
+                    self.db.commit()  # Commit each order immediately
                     stats["imported"] += 1
                 except Exception as e:
+                    self.db.rollback()  # Rollback failed order
                     stats["errors"] += 1
                     stats["error_messages"].append(
                         f"Shipment {shipment_id}: {str(e)}"