diff --git a/client/startup/loginViaQuery.ts b/client/startup/loginViaQuery.ts
index 485dda8fb2a..5c7fcbf8e7d 100644
--- a/client/startup/loginViaQuery.ts
+++ b/client/startup/loginViaQuery.ts
@@ -1,17 +1,20 @@
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
 
 Meteor.startup(() => {
-	const resumeToken = FlowRouter.getQueryParam('resumeToken');
-	if (!resumeToken) {
-		return;
-	}
-
-	Meteor.loginWithToken(resumeToken, () => {
-		if (FlowRouter.getRouteName()) {
-			FlowRouter.setQueryParams({ resumeToken: null, userId: null });
+	Tracker.afterFlush(() => {
+		const resumeToken = FlowRouter.getQueryParam('resumeToken');
+		if (!resumeToken) {
 			return;
 		}
-		FlowRouter.go('/home');
+
+		Meteor.loginWithToken(resumeToken, () => {
+			if (FlowRouter.getRouteName()) {
+				FlowRouter.setQueryParams({ resumeToken: null, userId: null });
+				return;
+			}
+			FlowRouter.go('/home');
+		});
 	});
 });