diff --git a/tools/tests/test_configuration_link.sh b/tools/tests/test_configuration_link.sh
index 686061a432..54cb8c45f9 100755
--- a/tools/tests/test_configuration_link.sh
+++ b/tools/tests/test_configuration_link.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-adb shell am start -a android.intent.action.VIEW -d "https://mobile.element.io?hs_url=https%3A%2F%2Felement.io"
+adb shell am start -a android.intent.action.VIEW -d "https://mobile.element.io/?hs_url=https%3A%2F%2Felement.io"
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 56abe98703..fab5be1257 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -206,8 +206,17 @@
                 <data android:host="develop.element.io" />
                 <!-- Matching asset file: https://staging.element.io/.well-known/assetlinks.json -->
                 <data android:host="staging.element.io" />
-                <!-- Fix it https://github.com/element-hq/element-android/issues/8904 -->
+            </intent-filter>
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="https" />
                 <data android:host="mobile.element.io" />
+                <!-- accept only root path -->
+                <data android:path="/" />
             </intent-filter>
         </activity>