diff --git a/src/plugins/condition/ConditionManager.js b/src/plugins/condition/ConditionManager.js
index d30f582d8b..4a18140cf7 100644
--- a/src/plugins/condition/ConditionManager.js
+++ b/src/plugins/condition/ConditionManager.js
@@ -421,8 +421,10 @@ export default class ConditionManager extends EventEmitter {
 
   updateConditionResults(normalizedDatum) {
     //We want to stop when the first condition evaluates to true.
-    this.conditions.forEach((condition) => {
+    this.conditions.some((condition) => {
       condition.updateResult(normalizedDatum);
+
+      return condition.result === true;
     });
   }