diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/SessionCreator.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/SessionCreator.kt
index 160fd2d556..cc00c963ea 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/SessionCreator.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/SessionCreator.kt
@@ -49,6 +49,8 @@ internal class DefaultSessionCreator @Inject constructor(
                 // remove trailing "/"
                 ?.trim { it == '/' }
                 ?.takeIf { it.isNotBlank() }
+                // It can be the same value, so in this case, do not check again the validity
+                ?.takeIf { it != homeServerConnectionConfig.homeServerUriBase.toString() }
                 ?.also { Timber.d("Overriding homeserver url to $it (will check if valid)") }
                 ?.let { Uri.parse(it) }
                 ?.takeIf {
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index e3385765a8..0d4d0050b7 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2871,7 +2871,7 @@
         One of the following may be compromised:\n\n- Your password\n- Your homeserver\n- This device, or the other device\n- The internet connection either device is using\n\nWe recommend you change your password & recovery key in Settings immediately.
     </string>
 
-    <string name="verify_cancelled_notice">Verify your devices from Settings.</string>
+    <string name="verify_cancelled_notice">Verification has been cancelled. You can start verification again.</string>
     <string name="verification_cancelled">Verification Cancelled</string>
 
     <string name="recovery_passphrase">Recovery Passphrase</string>