diff --git a/lib/reducers/message-reducer.js b/lib/reducers/message-reducer.js
--- a/lib/reducers/message-reducer.js
+++ b/lib/reducers/message-reducer.js
@@ -1222,6 +1222,25 @@
         ) {
           media.push({ ...singleMedia, ...mediaUpdate });
           replaced = true;
+        } else if (
+          singleMedia.type === 'photo' &&
+          mediaUpdate.type === 'encrypted_photo'
+        ) {
+          // these fields are absent in encrypted_photo type
+          const original = _omit(['uri', 'localMediaSelection'])(singleMedia);
+          media.push({ ...original, ...mediaUpdate });
+          replaced = true;
+        } else if (
+          singleMedia.type === 'video' &&
+          mediaUpdate.type === 'encrypted_video'
+        ) {
+          const original = _omit([
+            'uri',
+            'thumbnailURI',
+            'localMediaSelection',
+          ])(singleMedia);
+          media.push({ ...original, ...mediaUpdate });
+          replaced = true;
         }
       }
       updatedMessage = { ...message, media };