diff --git a/src/chat/functions/generateMessageID.ts b/src/chat/functions/generateMessageID.ts
index eaa88c7b15..c9919e848b 100644
--- a/src/chat/functions/generateMessageID.ts
+++ b/src/chat/functions/generateMessageID.ts
@@ -23,7 +23,9 @@ import { randomMessageId } from '../../whatsapp/functions';
  *
  * @category Message
  */
-export function generateMessageID(chat: string | ChatModel | Wid): MsgKey {
+export async function generateMessageID(
+  chat: string | ChatModel | Wid
+): Promise<MsgKey> {
   const from = UserPrefs.getMaybeMeUser();
   let to: Wid;
 
@@ -44,7 +46,7 @@ export function generateMessageID(chat: string | ChatModel | Wid): MsgKey {
   return new MsgKey({
     from,
     to,
-    id: randomMessageId(),
+    id: await Promise.resolve(randomMessageId()),
     participant,
     selfDir: 'out',
   });
diff --git a/src/chat/functions/prepareRawMessage.ts b/src/chat/functions/prepareRawMessage.ts
index 905aec9083..dcd7a7ecd2 100644
--- a/src/chat/functions/prepareRawMessage.ts
+++ b/src/chat/functions/prepareRawMessage.ts
@@ -91,7 +91,7 @@ export async function prepareRawMessage<T extends RawMessage>(
   }
 
   if (!message.id) {
-    message.id = generateMessageID(chat);
+    message.id = await generateMessageID(chat);
   }
 
   if (options.mentionedList && !Array.isArray(options.mentionedList)) {
diff --git a/src/group/functions/setDescription.ts b/src/group/functions/setDescription.ts
index f4a66f71e7..5e049718ea 100644
--- a/src/group/functions/setDescription.ts
+++ b/src/group/functions/setDescription.ts
@@ -51,7 +51,7 @@ export async function setDescription(
   /**
    * @todo change randomMessageId to randomHex
    */
-  const tagId = randomMessageId();
+  const tagId = await Promise.resolve(randomMessageId());
 
   await sendSetGroupDescription(
     groupChat.id,
diff --git a/src/whatsapp/functions/randomId.ts b/src/whatsapp/functions/randomId.ts
index 8fcb03cbad..ce10f0c416 100644
--- a/src/whatsapp/functions/randomId.ts
+++ b/src/whatsapp/functions/randomId.ts
@@ -19,8 +19,10 @@ import { exportModule } from '../exportModule';
 /** @whatsapp 65212
  * @whatsapp 15860 >= 2.2204.13
  * @whatsapp 465212 >= 2.2222.8
+ * @returns Promise for @whatsapp >= 2.2321.4
+ * @returns string for @whatsapp < 2.2321.4
  */
-export declare function randomMessageId(): string;
+export declare function randomMessageId(): string | Promise<string>;
 
 exportModule(
   exports,