diff --git a/Classes/ContactsListTableView.m b/Classes/ContactsListTableView.m
index e35104ba6..2ac7f7ce8 100644
--- a/Classes/ContactsListTableView.m
+++ b/Classes/ContactsListTableView.m
@@ -126,7 +126,7 @@ static int ms_strcmpfuz(const char *fuzzy_word, const char *sentence) {
 			return name2ASCII;
 		}
 	}
-	return nil;
+	return NSLocalizedString(@"Unknown", nil);
 }
 
 - (void)loadData {
@@ -186,7 +186,7 @@ static int ms_strcmpfuz(const char *fuzzy_word, const char *sentence) {
 				  add = (contact.emails.count > 0);
 				}
 
-				NSMutableString *name = [self displayNameForContact:contact] ? [[NSMutableString alloc] initWithString: [self displayNameForContact:contact]] : nil;
+				NSMutableString *name = [[NSMutableString alloc] initWithString: [self displayNameForContact:contact]];
 				if (add && name != nil) {
 					NSString *firstChar = [[name substringToIndex:1] uppercaseString];
 					// Put in correct subAr
diff --git a/Classes/Utils/FastAddressBook.m b/Classes/Utils/FastAddressBook.m
index 75a60acb0..e1f6a6e82 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)
+	if (contact && ![contact.displayName isEqualToString:@""])
 		return [FastAddressBook displayNameForContact:contact];
 
 	LinphoneFriend *friend = linphone_core_find_friend(LC, addr);