diff --git a/src/Ombi/ClientApp/app/login/login.component.ts b/src/Ombi/ClientApp/app/login/login.component.ts
index 67105f225..957ced058 100644
--- a/src/Ombi/ClientApp/app/login/login.component.ts
+++ b/src/Ombi/ClientApp/app/login/login.component.ts
@@ -157,7 +157,9 @@ export class LoginComponent implements OnDestroy, OnInit {
   
               if (this.authService.loggedIn()) {
                   this.ngOnDestroy();
-                  this.oAuthWindow.close();
+                  if(this.oAuthWindow) {
+                    this.oAuthWindow.close();
+                  }
                   this.router.navigate(["search"]);
                   return;
               }