diff --git a/src/components/list-data-source.coffee b/src/components/list-data-source.coffee
index b12a0c34d..29fe4bd07 100644
--- a/src/components/list-data-source.coffee
+++ b/src/components/list-data-source.coffee
@@ -26,9 +26,10 @@ class ListDataSource
 
     return =>
       @_emitter.removeListener('trigger', eventHandler)
-      if @_emitter.listenerCount('trigger') is 0
-        @_cleanedup = true
-        @cleanup()
+      process.nextTick =>
+        if @_emitter.listenerCount('trigger') is 0
+          @_cleanedup = true
+          @cleanup()
 
   loaded: ->
     throw new Error("ListDataSource base class does not implement loaded()")