diff --git a/src/view/com/util/UserAvatar.tsx b/src/view/com/util/UserAvatar.tsx
index 3294c81689..afe06e0c85 100644
--- a/src/view/com/util/UserAvatar.tsx
+++ b/src/view/com/util/UserAvatar.tsx
@@ -163,7 +163,7 @@ export function UserAvatar({
           onSelectNewAvatar?.(croppedImage)
         },
       },
-      {
+      !!avatar && {
         testID: 'changeAvatarRemoveBtn',
         label: 'Remove',
         icon: ['far', 'trash-can'] as IconProp,
@@ -173,6 +173,7 @@ export function UserAvatar({
       },
     ],
     [
+      avatar,
       onSelectNewAvatar,
       requestCameraAccessIfNeeded,
       requestPhotoAccessIfNeeded,
diff --git a/src/view/com/util/UserBanner.tsx b/src/view/com/util/UserBanner.tsx
index 6e08be505f..e3dfdca812 100644
--- a/src/view/com/util/UserBanner.tsx
+++ b/src/view/com/util/UserBanner.tsx
@@ -67,7 +67,7 @@ export function UserBanner({
         )
       },
     },
-    {
+    !!banner && {
       testID: 'changeBannerRemoveBtn',
       label: 'Remove',
       icon: ['far', 'trash-can'] as IconProp,