diff --git a/src/Socket/messages-recv.ts b/src/Socket/messages-recv.ts
index 93526c7..5d2407a 100644
--- a/src/Socket/messages-recv.ts
+++ b/src/Socket/messages-recv.ts
@@ -474,12 +474,12 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
 					}
 
 					cleanMessage(msg, authState.creds.me!.id)
+
+					await upsertMessage(msg, node.attrs.offline ? 'append' : 'notify')
 				}
 			),
 			sendMessageAck(node)
 		])
-
-		await upsertMessage(msg, node.attrs.offline ? 'append' : 'notify')
 	}
 
 	const handleCall = async(node: BinaryNode) => {