diff --git a/src/app/event-emitter.coffee b/src/app/event-emitter.coffee
index 53692109d..b77fe26ef 100644
--- a/src/app/event-emitter.coffee
+++ b/src/app/event-emitter.coffee
@@ -66,12 +66,15 @@ module.exports =
     @afterUnsubscribe?() if @subscriptionCount() < subscriptionCountBefore
 
   pauseEvents: ->
-    @queuedEvents = []
+    @pauseCount ?= 0
+    if @pauseCount++ == 0
+      @queuedEvents ?= []
 
   resumeEvents: ->
-    queuedEvents = @queuedEvents
-    @queuedEvents = null
-    @trigger(event...) for event in queuedEvents
+    if --@pauseCount == 0
+      queuedEvents = @queuedEvents
+      @queuedEvents = null
+      @trigger(event...) for event in queuedEvents
 
   subscriptionCount: ->
     count = 0