diff --git a/src/utils/authentication.js b/src/utils/authentication.js
index 49c23ce..1c22744 100644
--- a/src/utils/authentication.js
+++ b/src/utils/authentication.js
@@ -117,6 +117,7 @@ export default class Authentication {
                 callback(token);
                 if (authWindow) {
                   authWindow.close();
+                  authWindow = null;
                 }
               });
             }
@@ -133,10 +134,6 @@ export default class Authentication {
         }
       });
 
-      authWindow.on('closed', function() {
-        authWindow = null;
-      });
-
       if (oldWindow) {
         oldWindow.close();
       }