diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index a9eb8fa66b4fe1cba57e31aa044b64852d2086a4..e00e77a20c25af7e96c8b11fbf4460d6172bd9f8 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -132,7 +132,7 @@
       cm.off("change", abort)
       if (state.waitingFor != id) return
       if (arg2 && annotations instanceof CodeMirror) annotations = arg2
-      updateLinting(cm, annotations)
+      cm.operation(function() {updateLinting(cm, annotations)})
     }, passOptions, cm);
   }
 
@@ -151,9 +151,9 @@
       var annotations = getAnnotations(cm.getValue(), passOptions, cm);
       if (!annotations) return;
       if (annotations.then) annotations.then(function(issues) {
-        updateLinting(cm, issues);
+        cm.operation(function() {updateLinting(cm, issues)})
       });
-      else updateLinting(cm, annotations);
+      else cm.operation(function() {updateLinting(cm, annotations)})
     }
   }