diff --git a/packages/frontend/src/main/app.js b/packages/frontend/src/main/app.js
index fa75218d4..cf889f891 100644
--- a/packages/frontend/src/main/app.js
+++ b/packages/frontend/src/main/app.js
@@ -77,9 +77,10 @@ async function init() {
   if (!authToken) {
     const gotToken = await checkAccessCodeAndGetTokens()
     if (gotToken) {
-      // token was retrieved - remove access code
-      window.location.href = '/'
-      return
+      // Remove access_code get param from current url
+      const url = new URL(window.location.href)
+      url.searchParams.delete('access_code')
+      window.history.replaceState({}, document.title, url.toString())
     }
   }