diff --git a/lib/media/file-utils.js b/lib/media/file-utils.js
index 5b7a331f06..c2c74953ec 100644
--- a/lib/media/file-utils.js
+++ b/lib/media/file-utils.js
@@ -33,7 +33,7 @@ const mediaConfig: { [mime: string]: MediaConfig } = Object.freeze({
     serverTranscodesImage: true,
   },
   'image/gif': {
-    mediaType: 'photo_or_video',
+    mediaType: 'photo',
     extension: 'gif',
     serverCanHandle: true,
     serverTranscodesImage: true,
diff --git a/lib/reducers/message-reducer.js b/lib/reducers/message-reducer.js
index 35816b3d18..fba16d6ea1 100644
--- a/lib/reducers/message-reducer.js
+++ b/lib/reducers/message-reducer.js
@@ -90,10 +90,9 @@ import {
   processUpdatesActionType,
 } from '../types/update-types';
 import { setNewSessionActionType } from '../utils/action-utils';
-import { isDev } from '../utils/dev-utils';
 import { assertObjectsAreEqual } from '../utils/objects';
 
-const PROCESSED_MSG_STORE_INVARIANTS_DISABLED = !isDev;
+const PROCESSED_MSG_STORE_INVARIANTS_DISABLED = false;
 const _mapValuesWithKeys = _mapValues.convert({ cap: false });
 
 // Input must already be ordered!
diff --git a/lib/reducers/thread-reducer.js b/lib/reducers/thread-reducer.js
index 219d02f4d2..389588d35a 100644
--- a/lib/reducers/thread-reducer.js
+++ b/lib/reducers/thread-reducer.js
@@ -50,11 +50,10 @@ import {
 import { actionLogger } from '../utils/action-logger';
 import { setNewSessionActionType } from '../utils/action-utils';
 import { getConfig } from '../utils/config';
-import { isDev } from '../utils/dev-utils';
 import { assertObjectsAreEqual } from '../utils/objects';
 import { sanitizeActionSecrets } from '../utils/sanitization';
 
-const PROCESSED_THREAD_STORE_INVARIANTS_DISABLED = !isDev;
+const PROCESSED_THREAD_STORE_INVARIANTS_DISABLED = false;
 
 function reduceThreadUpdates(
   threadInfos: { +[id: string]: RawThreadInfo },
diff --git a/native/media/media-gallery-keyboard.react.js b/native/media/media-gallery-keyboard.react.js
index 9660cfcd4d..116d5e0d98 100644
--- a/native/media/media-gallery-keyboard.react.js
+++ b/native/media/media-gallery-keyboard.react.js
@@ -188,7 +188,7 @@ class MediaGalleryKeyboard extends React.PureComponent<Props, State> {
       } = await MediaLibrary.getAssetsAsync({
         first: 20,
         after,
-        mediaType: [MediaLibrary.MediaType.photo, MediaLibrary.MediaType.video],
+        mediaType: [MediaLibrary.MediaType.photo],
         sortBy: [MediaLibrary.SortBy.modificationTime],
       });