diff --git a/client/scripts/ui.js b/client/scripts/ui.js
index 7fff1f7..426bbc9 100644
--- a/client/scripts/ui.js
+++ b/client/scripts/ui.js
@@ -438,10 +438,10 @@ class Notifications {
         const visibilitychangeHandler = () => {                             
             if (document.visibilityState === 'visible') {    
                 notification.close();
-                document.removeEventListener('visibilitychange', visibilitychangeHandler);
+                Events.off('visibilitychange', visibilitychangeHandler);
             }                                                       
         };                                                                                
-        document.addEventListener('visibilitychange', visibilitychangeHandler);
+        Events.on('visibilitychange', visibilitychangeHandler);
 
         return notification;
     }