diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java
index 36e80e68b..b6a5ded10 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java
@@ -365,9 +365,9 @@ public class SaveCommandBuilder {
             } catch (InterruptedException e) {
                 throw new RuntimeException(e);
             }
-            // Reset timer of warning on leaving page
-            ConfirmCloseUtil.resetConfirmClose();
             if (Executions.getCurrent() != null) {
+                // Reset timer of warning on leaving page
+                ConfirmCloseUtil.resetConfirmClose();
                 if (SecurityUtils.loggedUserCanWrite(state.getOrder())) {
                     ConfirmCloseUtil
                             .setConfirmClose(