diff --git a/src/browser/Lifecycle.ts b/src/browser/Lifecycle.ts
index 1344ea9b..a8172db5 100644
--- a/src/browser/Lifecycle.ts
+++ b/src/browser/Lifecycle.ts
@@ -17,12 +17,13 @@ export function addDisposableDomListener(
   useCapture?: boolean
 ): IDisposable {
   node.addEventListener(type, handler, useCapture);
+  let disposed = false;
   return {
     dispose: () => {
-      if (!handler) {
-        // Already disposed
+      if (!disposed) {
         return;
       }
+      disposed = true;
       node.removeEventListener(type, handler, useCapture);
     }
   };