diff --git a/lib/shared/messages/edit-message-spec.js b/lib/shared/messages/edit-message-spec.js
--- a/lib/shared/messages/edit-message-spec.js
+++ b/lib/shared/messages/edit-message-spec.js
@@ -118,7 +118,7 @@
     rawMessageInfo: RawEditMessageInfo,
     platformDetails: ?PlatformDetails,
   ): RawEditMessageInfo | RawUnsupportedMessageInfo {
-    if (hasMinCodeVersion(platformDetails, 1000)) {
+    if (hasMinCodeVersion(platformDetails, 215)) {
       return rawMessageInfo;
     }
     const { id } = rawMessageInfo;
diff --git a/lib/shared/unshim-utils.js b/lib/shared/unshim-utils.js
--- a/lib/shared/unshim-utils.js
+++ b/lib/shared/unshim-utils.js
@@ -45,6 +45,7 @@
   messageTypes.MULTIMEDIA,
   messageTypes.REACTION,
   messageTypes.TOGGLE_PIN,
+  messageTypes.EDIT_MESSAGE,
 ]);
 function unshimMessageInfos(
   messageInfos: $ReadOnlyArray<RawMessageInfo>,
diff --git a/native/redux/persist.js b/native/redux/persist.js
--- a/native/redux/persist.js
+++ b/native/redux/persist.js
@@ -532,6 +532,7 @@
   },
   [38]: state =>
     updateClientDBThreadStoreThreadInfos(state, updateRolesAndPermissions),
+  [39]: (state: AppState) => unshimClientDB(state, [messageTypes.EDIT_MESSAGE]),
 };
 
 // After migration 31, we'll no longer want to persist `messageStore.messages`
@@ -612,7 +613,7 @@
     'storeLoaded',
   ],
   debug: __DEV__,
-  version: 38,
+  version: 39,
   transforms: [messageStoreMessagesBlocklistTransform],
   migrate: (createMigrate(migrations, { debug: __DEV__ }): any),
   timeout: ((__DEV__ ? 0 : undefined): number | void),