diff --git a/lib/shared/messages/multimedia-message-spec.js b/lib/shared/messages/multimedia-message-spec.js
--- a/lib/shared/messages/multimedia-message-spec.js
+++ b/lib/shared/messages/multimedia-message-spec.js
@@ -256,8 +256,12 @@
       };
     } else if (unwrapped.type === messageTypes.MULTIMEDIA) {
       for (const { type } of unwrapped.media) {
-        // TODO: add encrypted_photo and encrypted_video here when supported
-        if (type !== 'photo' && type !== 'video') {
+        if (
+          type !== 'photo' &&
+          type !== 'video' &&
+          type !== 'encrypted_photo' &&
+          type !== 'encrypted_video'
+        ) {
           return messageInfo;
         }
       }
diff --git a/native/redux/persist.js b/native/redux/persist.js
--- a/native/redux/persist.js
+++ b/native/redux/persist.js
@@ -390,6 +390,7 @@
     const { threadIDsToNotifIDs, ...stateSansThreadIDsToNotifIDs } = state;
     return stateSansThreadIDsToNotifIDs;
   },
+  [35]: (state: AppState) => unshimClientDB(state, [messageTypes.MULTIMEDIA]),
 };
 
 // After migration 31, we'll no longer want to persist `messageStore.messages`