diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
index aa6f507b5..59b19b830 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
@@ -1526,6 +1526,9 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
         }
 
         private void updateAndRefresh() {
+            if (planningState.isEmpty()) {
+                return;
+            }
             update();
             refresh();
         }