diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter.kt
index 370839a584..42f7f7741b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter.kt
@@ -587,7 +587,7 @@ open class ContactSearchAdapter(
               }
             )
           }
-          .sortedWith(compareBy({ it.recipient.isSelf }, { it.displayName }))
+          .sortedWith(compareBy({ it.recipient.isUnregistered }, { it.recipient.isSelf }, { it.displayName }))
           .joinToString(", ") { it.displayName }
       }
     }