diff --git a/commons/src/main/kotlin/org/fossify/commons/models/contacts/Contact.kt b/commons/src/main/kotlin/org/fossify/commons/models/contacts/Contact.kt
index 208ed2030..822f00777 100644
--- a/commons/src/main/kotlin/org/fossify/commons/models/contacts/Contact.kt
+++ b/commons/src/main/kotlin/org/fossify/commons/models/contacts/Contact.kt
@@ -53,20 +53,20 @@ data class Contact(
     override fun compareTo(other: Contact): Int {
         var result = when {
             sorting and SORT_BY_FIRST_NAME != 0 -> {
-                val firstString = firstName.normalizeString()
-                val secondString = other.firstName.normalizeString()
+                val firstString = firstName.ifEmpty { surname }.normalizeString()
+                val secondString = other.firstName.ifEmpty { other.surname }.normalizeString()
                 compareUsingStrings(firstString, secondString, other)
             }
 
             sorting and SORT_BY_MIDDLE_NAME != 0 -> {
-                val firstString = middleName.normalizeString()
-                val secondString = other.middleName.normalizeString()
+                val firstString = middleName.ifEmpty { firstName }.normalizeString()
+                val secondString = other.middleName.ifEmpty { other.firstName }.normalizeString()
                 compareUsingStrings(firstString, secondString, other)
             }
 
             sorting and SORT_BY_SURNAME != 0 -> {
-                val firstString = surname.normalizeString()
-                val secondString = other.surname.normalizeString()
+                val firstString = surname.ifEmpty { firstName }.normalizeString()
+                val secondString = other.surname.ifEmpty { other.firstName }.normalizeString()
                 compareUsingStrings(firstString, secondString, other)
             }