diff --git a/src/LegacySocket/messages.ts b/src/LegacySocket/messages.ts
index 0d4fa08..4051e74 100644
--- a/src/LegacySocket/messages.ts
+++ b/src/LegacySocket/messages.ts
@@ -125,7 +125,7 @@ const makeMessagesSocket = (config: LegacySocketConfig) => {
 				!!message.message ||
 				(message.messageStubType === WAMessageStubType.CIPHERTEXT && treatCiphertextMessagesAsReal)
 			)
-			&& !message.message!.protocolMessage
+			&& !message.message?.protocolMessage
 		) {
 			chatUpdate.conversationTimestamp = +toNumber(message.messageTimestamp)
 			// add to count if the message isn't from me & there exists a message
diff --git a/src/Socket/messages-recv.ts b/src/Socket/messages-recv.ts
index 58090fd..5498345 100644
--- a/src/Socket/messages-recv.ts
+++ b/src/Socket/messages-recv.ts
@@ -553,7 +553,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
 						!!msg.message ||
 						(msg.messageStubType === WAMessageStubType.CIPHERTEXT && treatCiphertextMessagesAsReal)
 					)
-					&& !msg.message!.protocolMessage
+					&& !msg.message?.protocolMessage
 				) {
 					chat.conversationTimestamp = toNumber(msg.messageTimestamp)
 					if(!msg.key.fromMe) {