diff --git a/lib/shared/message-utils.js b/lib/shared/message-utils.js
--- a/lib/shared/message-utils.js
+++ b/lib/shared/message-utils.js
@@ -637,6 +637,10 @@
   return `${localIDPrefix}${nextLocalID}`;
 }
 
+function getIDFromLocalID(localID: string): string {
+  return localID.replace(localIDPrefix, '');
+}
+
 function isInvalidSidebarSource(
   message: RawMessageInfo | MessageInfo,
 ): boolean %checks {
@@ -820,4 +824,5 @@
   isUnableToBeRenderedIndependently,
   findNewestMessageTimePerKeyserver,
   useFetchMessages,
+  getIDFromLocalID,
 };
diff --git a/lib/shared/threads/protocols/dm-thread-protocol.js b/lib/shared/threads/protocols/dm-thread-protocol.js
--- a/lib/shared/threads/protocols/dm-thread-protocol.js
+++ b/lib/shared/threads/protocols/dm-thread-protocol.js
@@ -39,7 +39,7 @@
       'localID should be set',
     );
 
-    const messageID = uuid.v4();
+    const messageID = localID.replace('local', '');
     const time = Date.now();
 
     const recipients =
@@ -97,7 +97,7 @@
       'localID should be set',
     );
 
-    const messageID = uuid.v4();
+    const messageID = localID.replace('local', '');
     const time = Date.now();
 
     const result = await utils.sendComposableDMOperation({