diff --git a/native/avatars/avatar-hooks.js b/native/avatars/avatar-hooks.js
--- a/native/avatars/avatar-hooks.js
+++ b/native/avatars/avatar-hooks.js
@@ -453,7 +453,7 @@
       } else if (option.id === 'ens') {
         return 'Use ENS Avatar';
       } else if (option.id === 'remove') {
-        return 'Remove avatar';
+        return 'Clear avatar';
       } else {
         return 'Cancel';
       }
diff --git a/native/avatars/edit-thread-avatar.react.js b/native/avatars/edit-thread-avatar.react.js
--- a/native/avatars/edit-thread-avatar.react.js
+++ b/native/avatars/edit-thread-avatar.react.js
@@ -32,18 +32,23 @@
   const isAvatarUpdateInProgress =
     isGalleryAvatarUpdateLoading || isRemoveAvatarUpdateLoading;
 
-  const actionSheetConfig = React.useMemo(
-    () => [
+  const actionSheetConfig = React.useMemo(() => {
+    const configOptions = [
       { id: 'emoji', onPress: onPressEmojiAvatarFlow },
       { id: 'image', onPress: selectFromGalleryAndUpdateThreadAvatar },
-      { id: 'remove', onPress: removeThreadAvatar },
-    ],
-    [
-      onPressEmojiAvatarFlow,
-      removeThreadAvatar,
-      selectFromGalleryAndUpdateThreadAvatar,
-    ],
-  );
+    ];
+
+    if (threadInfo.avatar) {
+      configOptions.push({ id: 'remove', onPress: removeThreadAvatar });
+    }
+
+    return configOptions;
+  }, [
+    onPressEmojiAvatarFlow,
+    removeThreadAvatar,
+    selectFromGalleryAndUpdateThreadAvatar,
+    threadInfo.avatar,
+  ]);
 
   const showAvatarActionSheet = useShowAvatarActionSheet(actionSheetConfig);
 
diff --git a/native/avatars/edit-user-avatar.react.js b/native/avatars/edit-user-avatar.react.js
--- a/native/avatars/edit-user-avatar.react.js
+++ b/native/avatars/edit-user-avatar.react.js
@@ -54,10 +54,13 @@
       configOptions.push({ id: 'ens', onPress: saveENSUserAvatar });
     }
 
-    configOptions.push({ id: 'remove', onPress: removeUserAvatar });
+    if (currentUserInfo?.avatar) {
+      configOptions.push({ id: 'remove', onPress: removeUserAvatar });
+    }
 
     return configOptions;
   }, [
+    currentUserInfo?.avatar,
     ensAvatarURI,
     onPressEmojiAvatarFlow,
     removeUserAvatar,