diff --git a/packages/client/src/utils/auth.ts b/packages/client/src/utils/auth.ts
index 0467083..328ff31 100644
--- a/packages/client/src/utils/auth.ts
+++ b/packages/client/src/utils/auth.ts
@@ -67,8 +67,22 @@ export const clearGroupId = (): void => {
 export const handleAuthTokenAndGroupIdFromUrl = (): void => {
   const tokenFromUrl = getAuthTokenFromUrl();
   const groupIdFromUrl = getGroupIdFromUrl();
-  if (tokenFromUrl && groupIdFromUrl) {
+
+  let updated = false;
+  if (tokenFromUrl) {
     saveAuthToken(tokenFromUrl);
+    updated = true;
+  }
+  if (groupIdFromUrl) {
     saveGroupId(groupIdFromUrl);
+    updated = true;
+  }
+
+  // Clean URL if we consumed any param
+  if (updated) {
+    const url = new URL(window.location.href);
+    url.searchParams.delete('authToken');
+    url.searchParams.delete('groupId');
+    window.history.replaceState(null, '', url.toString());
   }
 };