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
@@ -26,7 +26,7 @@
   return unshimmed ?? unwrapped;
 }
 
-function unshimMessageStore(
+function DEPRECATED_unshimMessageStore(
   messageStore: MessageStore,
   unshimTypes: $ReadOnlyArray<MessageType>,
 ): MessageStore {
@@ -53,4 +53,4 @@
   );
 }
 
-export { unshimMessageStore, unshimMessageInfos, unshimFunc };
+export { DEPRECATED_unshimMessageStore, unshimMessageInfos, unshimFunc };
diff --git a/native/redux/persist.js b/native/redux/persist.js
--- a/native/redux/persist.js
+++ b/native/redux/persist.js
@@ -13,7 +13,10 @@
   getContainingThreadID,
   getCommunity,
 } from 'lib/shared/thread-utils.js';
-import { unshimMessageStore, unshimFunc } from 'lib/shared/unshim-utils.js';
+import {
+  DEPRECATED_unshimMessageStore,
+  unshimFunc,
+} from 'lib/shared/unshim-utils.js';
 import { defaultEnabledApps } from 'lib/types/enabled-apps.js';
 import { defaultCalendarFilters } from 'lib/types/filter-types.js';
 import {
@@ -123,7 +126,9 @@
   }),
   [11]: (state: AppState) => ({
     ...state,
-    messageStore: unshimMessageStore(state.messageStore, [messageTypes.IMAGES]),
+    messageStore: DEPRECATED_unshimMessageStore(state.messageStore, [
+      messageTypes.IMAGES,
+    ]),
   }),
   [12]: (state: AppState) => ({
     ...state,
@@ -199,13 +204,13 @@
   },
   [20]: (state: AppState) => ({
     ...state,
-    messageStore: unshimMessageStore(state.messageStore, [
+    messageStore: DEPRECATED_unshimMessageStore(state.messageStore, [
       messageTypes.UPDATE_RELATIONSHIP,
     ]),
   }),
   [21]: (state: AppState) => ({
     ...state,
-    messageStore: unshimMessageStore(state.messageStore, [
+    messageStore: DEPRECATED_unshimMessageStore(state.messageStore, [
       messageTypes.CREATE_SIDEBAR,
       messageTypes.SIDEBAR_SOURCE,
     ]),