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
@@ -8,14 +8,15 @@
   useShowAvatarActionSheet,
 } from './avatar-hooks.js';
 import EditAvatarBadge from './edit-avatar-badge.react.js';
+import UserAvatar from './user-avatar.react.js';
 
 type Props = {
-  +children: React.Node,
+  +userID: ?string,
   +onPressEmojiAvatarFlow: () => mixed,
   +disabled?: boolean,
 };
 function EditUserAvatar(props: Props): React.Node {
-  const { onPressEmojiAvatarFlow, children, disabled } = props;
+  const { userID, onPressEmojiAvatarFlow, disabled } = props;
 
   const selectAndUploadFromGallery = useSelectAndUploadFromGallery();
 
@@ -31,7 +32,7 @@
 
   return (
     <TouchableOpacity onPress={showAvatarActionSheet} disabled={disabled}>
-      {children}
+      <UserAvatar userID={userID} size="profile" />
       {!disabled ? <EditAvatarBadge /> : null}
     </TouchableOpacity>
   );
diff --git a/native/profile/profile-screen.react.js b/native/profile/profile-screen.react.js
--- a/native/profile/profile-screen.react.js
+++ b/native/profile/profile-screen.react.js
@@ -20,7 +20,6 @@
 import type { ProfileNavigationProp } from './profile.react.js';
 import { deleteNativeCredentialsFor } from '../account/native-credentials.js';
 import EditUserAvatar from '../avatars/edit-user-avatar.react.js';
-import UserAvatar from '../avatars/user-avatar.react.js';
 import Action from '../components/action-row.react.js';
 import Button from '../components/button.react.js';
 import EditSettingButton from '../components/edit-setting-button.react.js';
@@ -133,12 +132,8 @@
           >
             <EditUserAvatar
               onPressEmojiAvatarFlow={this.onPressEmojiAvatarFlow}
-            >
-              <UserAvatar
-                size="profile"
-                userID={this.props.currentUserInfo?.id}
-              />
-            </EditUserAvatar>
+              userID={this.props.currentUserInfo?.id}
+            />
           </View>
         </>
       );