diff --git a/Ring/Ring/Features/ContactRequests/ContactRequestsViewModel.swift b/Ring/Ring/Features/ContactRequests/ContactRequestsViewModel.swift
index 747eb1ba663df32cc418aca6792607e6215b8473..67b02ab9d5277d689c94869a9be1abd50a3fd2aa 100644
--- a/Ring/Ring/Features/ContactRequests/ContactRequestsViewModel.swift
+++ b/Ring/Ring/Features/ContactRequests/ContactRequestsViewModel.swift
@@ -95,7 +95,7 @@ class ContactRequestsViewModel: ViewModel {
                 return lookupNameResponse.address == item.contactRequest.ringId
             })
             .subscribe(onNext: { lookupNameResponse in
-                if lookupNameResponse.state == .found {
+                if lookupNameResponse.state == .found && !lookupNameResponse.name.isEmpty {
                     item.userName.value = lookupNameResponse.name
                 } else {
                     item.userName.value = lookupNameResponse.address
diff --git a/Ring/Ring/Features/Conversations/Conversation/ConversationViewModel.swift b/Ring/Ring/Features/Conversations/Conversation/ConversationViewModel.swift
index 11516fccdc309ff65f80fa9acf79b529f1cc221c..4cfd2b82facf3d9b01d98abe24cf0b6b743a2748 100644
--- a/Ring/Ring/Features/Conversations/Conversation/ConversationViewModel.swift
+++ b/Ring/Ring/Features/Conversations/Conversation/ConversationViewModel.swift
@@ -103,7 +103,7 @@ class ConversationViewModel: ViewModel {
                         return lookupNameResponse.address != nil &&
                             lookupNameResponse.address == recipientRingId
                     }).subscribe(onNext: { [unowned self] lookupNameResponse in
-                        if let name = lookupNameResponse.name {
+                        if let name = lookupNameResponse.name, !name.isEmpty {
                             self.userName.onNext(name)
                             contact?.userName = name
                         } else if let address = lookupNameResponse.address {