diff --git a/keyserver/src/creators/message-creator.js b/keyserver/src/creators/message-creator.js
--- a/keyserver/src/creators/message-creator.js
+++ b/keyserver/src/creators/message-creator.js
@@ -185,7 +185,7 @@
       creation, target_message)
     VALUES ${messageInsertRows}
   `;
-  const messageInsertPromise = dbQuery(messageInsertQuery);
+  await dbQuery(messageInsertQuery);
 
   const postMessageSendPromise = postMessageSend(
     viewer,
@@ -204,7 +204,6 @@
   }
 
   await Promise.all([
-    messageInsertPromise,
     updateRepliesCount(threadsToMessageIndices, newMessageDatas),
     viewer.isScriptViewer ? postMessageSendPromise : undefined,
   ]);