diff --git a/src/app/main.ts b/src/app/main.ts
index 7bb9fed99..dffd80cc9 100644
--- a/src/app/main.ts
+++ b/src/app/main.ts
@@ -1,7 +1,18 @@
 import 'meteor-client';
 
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-
+import { MeteorObservable } from 'meteor-rxjs';
+import { Meteor } from 'meteor/meteor';
 import { AppModule } from './app.module';
 
-platformBrowserDynamic().bootstrapModule(AppModule);
+Meteor.startup(() => {
+  const subscription = MeteorObservable.autorun().subscribe(() => {
+
+    if (Meteor.loggingIn()) {
+      return;
+    }
+
+    setTimeout(() => subscription.unsubscribe());
+    platformBrowserDynamic().bootstrapModule(AppModule);
+  });
+});