diff --git a/Classes/Contact.m b/Classes/Contact.m
index 149e0a737..fd27e9078 100644
--- a/Classes/Contact.m
+++ b/Classes/Contact.m
@@ -136,7 +136,7 @@
 		NSString *lOrganization = _person.organizationName;
 		NSString *lLocalizedOrganization = [FastAddressBook localizedLabel:lOrganization];
 
-		if (compositeName)
+		if (compositeName && ![compositeName isEqualToString:@""])
 			return compositeName;
 		if (lLocalizedFirstName || lLocalizedLastName)
 			return [NSString stringWithFormat:@"%@ %@", lLocalizedFirstName, lLocalizedLastName];
diff --git a/Classes/Utils/FastAddressBook.m b/Classes/Utils/FastAddressBook.m
index e1f6a6e82..9e58f69e3 100644
--- a/Classes/Utils/FastAddressBook.m
+++ b/Classes/Utils/FastAddressBook.m
@@ -318,7 +318,7 @@
 
 + (NSString *)displayNameForAddress:(const LinphoneAddress *)addr {
 	Contact *contact = [FastAddressBook getContactWithAddress:addr];
-	if (contact && ![contact.displayName isEqualToString:@""])
+	if (contact && ![contact.displayName isEqualToString:NSLocalizedString(@"Unknown", nil)])
 		return [FastAddressBook displayNameForContact:contact];
 
 	LinphoneFriend *friend = linphone_core_find_friend(LC, addr);