diff --git a/src/main/java/com/netgrif/application/engine/workflow/service/WorkflowService.java b/src/main/java/com/netgrif/application/engine/workflow/service/WorkflowService.java
index 130beb3090d..896a9d42cae 100644
--- a/src/main/java/com/netgrif/application/engine/workflow/service/WorkflowService.java
+++ b/src/main/java/com/netgrif/application/engine/workflow/service/WorkflowService.java
@@ -604,11 +604,15 @@ private EventOutcome addMessageToOutcome(PetriNet net, CaseEventType type, Event
     }
 
     private void checkChangedDataSet(Case useCase) {
+        boolean anyChanged = false;
         for (DataField data : useCase.getDataSet().values()) {
             if (data.isChanged()) {
-                useCase.setLastModifiedDataSet(LocalDateTime.now());
-                return;
+                anyChanged = true;
             }
-        };
-    };
-}
+            data.setChanged(false);
+        }
+        if (anyChanged) {
+            useCase.setLastModifiedDataSet(LocalDateTime.now());
+        }
+    }
+}
\ No newline at end of file