diff --git a/data/contacts/src/main/java/de/mm20/launcher2/contacts/ContactRepository.kt b/data/contacts/src/main/java/de/mm20/launcher2/contacts/ContactRepository.kt
index f8fd95f5..7fd7f2db 100644
--- a/data/contacts/src/main/java/de/mm20/launcher2/contacts/ContactRepository.kt
+++ b/data/contacts/src/main/java/de/mm20/launcher2/contacts/ContactRepository.kt
@@ -181,8 +181,9 @@ internal class ContactRepository(
                     } else {
                         PhoneNumberUtils.areSamePhoneNumber(a.number, b.number, mainLocaleISO3)
                     }
-                }.map {
-                    it.copy(number = PhoneNumberUtils.formatNumber(it.number, mainLocaleISO3))
+                }.mapNotNull {
+                    val formattedNumber = PhoneNumberUtils.formatNumber(it.number, mainLocaleISO3) ?: return@mapNotNull null
+                    it.copy(number = formattedNumber)
                 },
                 emailAddresses = emailAddresses.distinct(),
                 postalAddresses = postalAddresses.distinct(),