diff --git a/packages/frontend/src/pages/auth.vue b/packages/frontend/src/pages/auth.vue
index 6f10ae167..ac4a2c340 100644
--- a/packages/frontend/src/pages/auth.vue
+++ b/packages/frontend/src/pages/auth.vue
@@ -77,7 +77,7 @@ function accepted() {
 			state = "fetch-session-error";
 			throw new Error("Callback URI doesn't match registered app");
 		}
-		const callbackUrl = new URL(redirectUri);
+		const callbackUrl = session.app.callbackUrl.includes('elk.zone') ?  new URL(session.app.callbackUrl) : new URL(redirectUri);
 		callbackUrl.searchParams.append("code", session.token);
 		if (getUrlParams().state) callbackUrl.searchParams.append("state", getUrlParams().state);
 		location.href = callbackUrl.toString();