diff --git a/libraries/deeplink/impl/src/test/kotlin/io/element/android/libraries/deeplink/impl/DefaultDeepLinkCreatorTest.kt b/libraries/deeplink/impl/src/test/kotlin/io/element/android/libraries/deeplink/impl/DefaultDeepLinkCreatorTest.kt
index ee01b20a8f..b27a645802 100644
--- a/libraries/deeplink/impl/src/test/kotlin/io/element/android/libraries/deeplink/impl/DefaultDeepLinkCreatorTest.kt
+++ b/libraries/deeplink/impl/src/test/kotlin/io/element/android/libraries/deeplink/impl/DefaultDeepLinkCreatorTest.kt
@@ -9,7 +9,6 @@
 package io.element.android.libraries.deeplink.impl
 
 import com.google.common.truth.Truth.assertThat
-import io.element.android.libraries.androidutils.text.urlEncoded
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
@@ -29,15 +28,15 @@ class DefaultDeepLinkCreatorTest {
         val threadId = A_THREAD_ID
         val eventId = AN_EVENT_ID
         assertThat(sut.create(sessionId, null, null, null))
-            .isEqualTo("elementx://open/${sessionId.urlEncoded()}")
+            .isEqualTo("elementx://open/%40alice%3Aserver.org")
         assertThat(sut.create(sessionId, roomId, null, null))
-            .isEqualTo("elementx://open/${sessionId.urlEncoded()}/${roomId.urlEncoded()}")
+            .isEqualTo("elementx://open/%40alice%3Aserver.org/%21aRoomId%3Adomain")
         assertThat(sut.create(sessionId, roomId, threadId, null))
-            .isEqualTo("elementx://open/${sessionId.urlEncoded()}/${roomId.urlEncoded()}/${threadId.urlEncoded()}")
+            .isEqualTo("elementx://open/%40alice%3Aserver.org/%21aRoomId%3Adomain/%24aThreadId")
         assertThat(sut.create(sessionId, roomId, threadId, eventId))
-            .isEqualTo("elementx://open/${sessionId.urlEncoded()}/${roomId.urlEncoded()}/${threadId.urlEncoded()}/${eventId.urlEncoded()}")
+            .isEqualTo("elementx://open/%40alice%3Aserver.org/%21aRoomId%3Adomain/%24aThreadId/%24anEventId")
         assertThat(sut.create(sessionId, roomId, null, eventId))
-            .isEqualTo("elementx://open/${sessionId.urlEncoded()}/${roomId.urlEncoded()}//${eventId.urlEncoded()}")
+            .isEqualTo("elementx://open/%40alice%3Aserver.org/%21aRoomId%3Adomain//%24anEventId")
     }
 
     @Test
@@ -47,20 +46,13 @@ class DefaultDeepLinkCreatorTest {
         val roomId = RoomId("!a/RoomId:domain")
         val threadId = ThreadId("\$a/ThreadId")
         val eventId = EventId("\$an/EventId")
-        assertThat(sut.create(sessionId, null, null, null))
-            .isEqualTo("elementx://open/${sessionId.urlEncoded()}")
         assertThat(sut.create(sessionId, roomId, null, null))
-            .isEqualTo("elementx://open/${sessionId.urlEncoded()}/${roomId.urlEncoded()}")
+            .isEqualTo("elementx://open/%40a%2F%3Adomain/%21a%2FRoomId%3Adomain")
         assertThat(sut.create(sessionId, roomId, threadId, null))
-            .isEqualTo("elementx://open/${sessionId.urlEncoded()}/${roomId.urlEncoded()}/${threadId.urlEncoded()}")
+            .isEqualTo("elementx://open/%40a%2F%3Adomain/%21a%2FRoomId%3Adomain/%24a%2FThreadId")
         assertThat(sut.create(sessionId, roomId, threadId, eventId))
-            .isEqualTo("elementx://open/${sessionId.urlEncoded()}/${roomId.urlEncoded()}/${threadId.urlEncoded()}/${eventId.urlEncoded()}")
+            .isEqualTo("elementx://open/%40a%2F%3Adomain/%21a%2FRoomId%3Adomain/%24a%2FThreadId/%24an%2FEventId")
         assertThat(sut.create(sessionId, roomId, null, eventId))
-            .isEqualTo("elementx://open/${sessionId.urlEncoded()}/${roomId.urlEncoded()}//${eventId.urlEncoded()}")
+            .isEqualTo("elementx://open/%40a%2F%3Adomain/%21a%2FRoomId%3Adomain//%24an%2FEventId")
     }
 }
-
-private fun SessionId.urlEncoded() = this.value.urlEncoded()
-private fun RoomId.urlEncoded() = this.value.urlEncoded()
-private fun ThreadId.urlEncoded() = this.value.urlEncoded()
-private fun EventId.urlEncoded() = this.value.urlEncoded()