diff --git a/src/app/display-buffer.coffee b/src/app/display-buffer.coffee
index 11f7bbae4..a13b863b0 100644
--- a/src/app/display-buffer.coffee
+++ b/src/app/display-buffer.coffee
@@ -605,9 +605,9 @@ class DisplayBuffer
         @maxLineLength = length
 
   handleMarkersUpdated: =>
-    event = @pendingChangeEvent
-    @pendingChangeEvent = null
-    @triggerChanged(event, false)
+    if event = @pendingChangeEvent
+      @pendingChangeEvent = null
+      @triggerChanged(event, false)
 
   handleMarkerCreated: (marker) =>
     new Fold(this, marker) if marker.matchesAttributes(@foldMarkerAttributes())