diff --git a/src/app/main.prod.ts b/src/app/main.prod.ts
index 3f7cad88e..f8d777373 100644
--- a/src/app/main.prod.ts
+++ b/src/app/main.prod.ts
@@ -5,8 +5,21 @@ import 'accounts-phone';
 
 import { platformBrowser } from '@angular/platform-browser';
 import { enableProdMode } from '@angular/core';
-
 import { AppModuleNgFactory } from './app.module.ngfactory';
+import { MeteorObservable } from 'meteor-rxjs';
+
+declare let Meteor;
+
+Meteor.startup(() => {
+  const sub = MeteorObservable.autorun().subscribe(() => {
+    if (Meteor.loggingIn()) return;
+
+    setTimeout(() => {
+      sub.unsubscribe();
+    });
+
+    enableProdMode();
+    platformBrowser().bootstrapModuleFactory(AppModuleNgFactory);
+  });
+});
 
-enableProdMode();
-platformBrowser().bootstrapModuleFactory(AppModuleNgFactory);