diff --git a/app/src/main/java/tech/relaycorp/letro/messages/repository/ConversationsRepository.kt b/app/src/main/java/tech/relaycorp/letro/messages/repository/ConversationsRepository.kt
index d38cccd8..b8fc113e 100644
--- a/app/src/main/java/tech/relaycorp/letro/messages/repository/ConversationsRepository.kt
+++ b/app/src/main/java/tech/relaycorp/letro/messages/repository/ConversationsRepository.kt
@@ -111,8 +111,8 @@ class ConversationsRepositoryImpl @Inject constructor(
                 recipientVeraId = recipient.contactVeraId,
                 sentAt = LocalDateTime.now(),
             )
-            messagesDao.insert(message)
             conversationsDao.createNewConversation(conversation)
+            messagesDao.insert(message)
 
             awalaManager.sendMessage(
                 outgoingMessage = AwalaOutgoingMessage(