diff --git a/jami-android/libjamiclient/src/main/kotlin/net/jami/model/Account.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/model/Account.kt
index df23871be78a05ef5b284301f2ef3afea0f534d6..95df7662a4a62f61ba506e359130bcf84897b8f4 100644
--- a/jami-android/libjamiclient/src/main/kotlin/net/jami/model/Account.kt
+++ b/jami-android/libjamiclient/src/main/kotlin/net/jami/model/Account.kt
@@ -708,7 +708,7 @@ class Account(
     fun getByUri(uri: Uri?): Conversation? =
         if (uri == null || uri.isEmpty) null
         else if (uri.isSwarm) getSwarm(uri.rawRingId) ?: pending[uri.uri]
-        else if (uri.isJami) getByKey(uri)
+        else if (uri.isJami || isSip) getByKey(uri)
         else null
 
     fun getByUri(uri: String?): Conversation? =
diff --git a/jami-android/libjamiclient/src/main/kotlin/net/jami/services/AccountService.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/services/AccountService.kt
index cfbf1247e8ce478eee172440e1e0c5ee4c5358d1..21131a343bf0cd35355ff8855402ee847125609f 100644
--- a/jami-android/libjamiclient/src/main/kotlin/net/jami/services/AccountService.kt
+++ b/jami-android/libjamiclient/src/main/kotlin/net/jami/services/AccountService.kt
@@ -944,7 +944,7 @@ class AccountService(
     }
 
     fun getConversationByUri(account: Account, conversationUri: Uri): Single<Conversation> =
-        if (conversationUri.isHexId) {
+        if (conversationUri.isHexId || account.isSip) {
             val conversation = account.getByUri(conversationUri)
             if (conversation != null) {
                 Single.just(conversation)