diff --git a/app/containers/Avatar/AvatarWithEdit.tsx b/app/containers/Avatar/AvatarWithEdit.tsx
index 1ea5dc9f0..74e1a8dba 100644
--- a/app/containers/Avatar/AvatarWithEdit.tsx
+++ b/app/containers/Avatar/AvatarWithEdit.tsx
@@ -9,7 +9,7 @@ import { BUTTON_HIT_SLOP } from '../message/utils';
 import styles from './styles';
 
 interface IAvatarContainer extends IAvatar {
-	handleEdit?: () => void;
+	handleEdit: () => void;
 }
 
 const AvatarWithEdit = ({
@@ -45,19 +45,17 @@ const AvatarWithEdit = ({
 				isStatic={isStatic}
 				rid={rid}
 			/>
-			{handleEdit ? (
-				<Button
-					title={I18n.t('Edit')}
-					type='secondary'
-					backgroundColor={colors.editAndUploadButtonAvatar}
-					onPress={handleEdit}
-					testID='avatar-edit-button'
-					style={styles.editAvatarButton}
-					styleText={[styles.textButton]}
-					color={colors.titleText}
-					hitSlop={BUTTON_HIT_SLOP}
-				/>
-			) : null}
+			<Button
+				title={I18n.t('Edit')}
+				type='secondary'
+				backgroundColor={colors.editAndUploadButtonAvatar}
+				onPress={handleEdit}
+				testID='avatar-edit-button'
+				style={styles.editAvatarButton}
+				styleText={[styles.textButton]}
+				color={colors.titleText}
+				hitSlop={BUTTON_HIT_SLOP}
+			/>
 		</>
 	);
 };