diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/MappingEvaluator.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/MappingEvaluator.java
index 9169347f443..0ee0c172d6c 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/MappingEvaluator.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/MappingEvaluator.java
@@ -488,7 +488,7 @@ public <V extends PrismValue, D extends ItemDefinition, T extends ObjectType, F
         for (MappingImpl<V,D> mapping: mappings) {
             XMLGregorianCalendar mappingNextRecomputeTime = mapping.getNextRecomputeTime();
             if (mappingNextRecomputeTime != null) {
-                if (nextRecomputeTime == null || nextRecomputeTime.compare(mappingNextRecomputeTime) == DatatypeConstants.GREATER) {
+                if (mapping.isSatisfyCondition() && (nextRecomputeTime == null || nextRecomputeTime.compare(mappingNextRecomputeTime) == DatatypeConstants.GREATER)) {
                     nextRecomputeTime = mappingNextRecomputeTime;
                     // TODO: maybe better description? But consider storage requirements. We do not want to store too much.
                     triggerOriginDescription = mapping.getIdentifier();