diff --git a/client/startup/loginViaQuery.js b/client/startup/loginViaQuery.js
index b6fe6dc847747..f4546bf9b5f7e 100644
--- a/client/startup/loginViaQuery.js
+++ b/client/startup/loginViaQuery.js
@@ -2,9 +2,16 @@ import { Meteor } from 'meteor/meteor';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 
 Meteor.startup(() => {
-	if (FlowRouter.getQueryParam('resumeToken')) {
-		Meteor.loginWithToken(FlowRouter.getQueryParam('resumeToken'), () => {
-			FlowRouter.go('/home');
-		});
+	const resumeToken = FlowRouter.getQueryParam('resumeToken');
+	if (!resumeToken) {
+		return;
 	}
+
+	Meteor.loginWithToken(resumeToken, () => {
+		if (FlowRouter.getRouteName()) {
+			FlowRouter.setQueryParams({ resumeToken: null, userId: null });
+			return;
+		}
+		FlowRouter.go('/home');
+	});
 });