diff --git a/src/Socket/messages-recv.ts b/src/Socket/messages-recv.ts
index fb9e64d2..2b80230d 100644
--- a/src/Socket/messages-recv.ts
+++ b/src/Socket/messages-recv.ts
@@ -765,6 +765,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
 				const setPicture = getBinaryNodeChild(node, 'set')
 				const delPicture = getBinaryNodeChild(node, 'delete')
 
+				// TODO: WAJIDHASH stuff proper support inhouse
 				ev.emit('contacts.update', [
 					{
 						id: jidNormalizedUser(node?.attrs?.from) || (setPicture || delPicture)?.attrs?.hash || '',
diff --git a/src/Utils/history.ts b/src/Utils/history.ts
index 4f1dac6e..df174892 100644
--- a/src/Utils/history.ts
+++ b/src/Utils/history.ts
@@ -326,8 +326,8 @@ export const processHistoryMessage = (item: proto.IHistorySync, logger?: ILogger
 
 				contacts.push({
 					id: chatId,
-					name: chat.name || undefined,
-					lid: chat.lidJid || undefined,
+					name: chat.displayName || chat.name || chat.username || undefined,
+					lid: chat.lidJid || chat.accountLid || undefined,
 					phoneNumber: chat.pnJid || undefined
 				})