diff --git a/src/BasePlatform.ts b/src/BasePlatform.ts
index 2093881cc5f..96f0c62b233 100644
--- a/src/BasePlatform.ts
+++ b/src/BasePlatform.ts
@@ -466,6 +466,7 @@ export default abstract class BasePlatform {
         // The redirect URL has to exactly match that registered at the OIDC server, so
         // ensure that the fragment part of the URL is empty.
         url.hash = "";
+        url.searchParams.set("no_universal_links", "true");
         return url;
     }
 
diff --git a/src/vector/app.tsx b/src/vector/app.tsx
index d0c689a2b4a..0d440ff963a 100644
--- a/src/vector/app.tsx
+++ b/src/vector/app.tsx
@@ -43,6 +43,7 @@ function onTokenLoginCompleted(): void {
     // a little nasty but let's redirect to clear them.
     const url = new URL(window.location.href);
 
+    url.searchParams.delete("no_universal_links");
     url.searchParams.delete("loginToken");
     url.searchParams.delete("state");
     url.searchParams.delete("code");