diff --git a/lib/utils/create-farcaster-raw-thread-info.js b/lib/utils/create-farcaster-raw-thread-info.js
--- a/lib/utils/create-farcaster-raw-thread-info.js
+++ b/lib/utils/create-farcaster-raw-thread-info.js
@@ -254,11 +254,9 @@
   let name = conversation.name ?? '';
   let description = conversation.description ?? '';
   if (!conversation.isGroup) {
-    //  For a 1-1 conversation, follow the Farcaster approach and show user's
-    //  name as the conversation name
     const otherUserName =
-      conversation.viewerContext.counterParty?.displayName ??
       conversation.viewerContext.counterParty?.username ??
+      conversation.viewerContext.counterParty?.displayName ??
       'anonymous';
     name = otherUserName;
     description = `Your Direct Cast with ${otherUserName}`;
@@ -330,8 +328,8 @@
   | { +result: 'updated', +threadInfo: FarcasterRawThreadInfo } {
   let updatedThreadInfo = threadInfo;
 
-  if (conversation.name !== threadInfo.name) {
-    updatedThreadInfo = { ...updatedThreadInfo, name: conversation.name ?? '' };
+  if (conversation.name && conversation.name !== threadInfo.name) {
+    updatedThreadInfo = { ...updatedThreadInfo, name: conversation.name };
   }
 
   if (conversation.description !== threadInfo.description) {