diff --git a/lib/mixins/decoration-management.js b/lib/mixins/decoration-management.js
index f9770d20..f47015e4 100644
--- a/lib/mixins/decoration-management.js
+++ b/lib/mixins/decoration-management.js
@@ -575,7 +575,9 @@ module.exports = class DecorationManagement {
     for (let i = 0, len = decorations.length; i < len; i++) {
       let decoration = decorations[i]
 
-      this.emitDecorationChanges(decoration.getProperties().type, decoration)
+      if (!this.adapter.editorDestroyed()) {
+        this.emitDecorationChanges(decoration.getProperties().type, decoration)
+      }
       this.emitter.emit('did-remove-decoration', {
         marker: marker,
         decoration: decoration