diff --git a/src/view/com/util/UserAvatar.tsx b/src/view/com/util/UserAvatar.tsx
index 406654e4df..79f243709f 100644
--- a/src/view/com/util/UserAvatar.tsx
+++ b/src/view/com/util/UserAvatar.tsx
@@ -9,6 +9,7 @@ import {
 } from 'react-native-image-crop-picker'
 import {getGradient} from '../../lib/asset-gen'
 import {colors} from '../../lib/styles'
+import { IMAGES_ENABLED } from '../../../build-flags'
 
 export function UserAvatar({
   isEditable = false,
@@ -85,7 +86,7 @@ export function UserAvatar({
     </Svg>
   )
 
-  return isEditable ? (
+  return isEditable && IMAGES_ENABLED ? (
     <TouchableOpacity onPress={handleEditAvatar}>
       {/* Added a react state temporary photo white the protocol does not support imagery */}
       {uploadedImage != null ? (
diff --git a/src/view/com/util/UserBanner.tsx b/src/view/com/util/UserBanner.tsx
index 0b83622f3c..174a29e7cc 100644
--- a/src/view/com/util/UserBanner.tsx
+++ b/src/view/com/util/UserBanner.tsx
@@ -9,6 +9,7 @@ import {
   openCropper,
   openPicker,
 } from 'react-native-image-crop-picker'
+import { IMAGES_ENABLED } from '../../../build-flags'
 
 export function UserBanner({
   handle,
@@ -75,7 +76,7 @@ export function UserBanner({
     </Svg>
   )
 
-  return isEditable ? (
+  return isEditable && IMAGES_ENABLED ? (
     <TouchableOpacity onPress={handleEditBanner}>
       {/* Added a react state temporary photo white the protocol does not support imagery */}
       {uploadedImage != null ? (