diff --git a/dev-helpers/oauth2-redirect.html b/dev-helpers/oauth2-redirect.html
index 72fbf81b..0f4d4953 100644
--- a/dev-helpers/oauth2-redirect.html
+++ b/dev-helpers/oauth2-redirect.html
@@ -66,7 +66,11 @@
         window.close();
     }
 
-    window.addEventListener('DOMContentLoaded', function () {
+    if( document.readyState !== 'loading' ) {
       run();
-    });
+    } else {
+      document.addEventListener('DOMContentLoaded', function () {
+        run();
+      });
+    }
 </script>