diff --git a/src/input/AvatarInputField.jsx b/src/input/AvatarInputField.jsx
index 1d1569d0..9b645b14 100644
--- a/src/input/AvatarInputField.jsx
+++ b/src/input/AvatarInputField.jsx
@@ -65,13 +65,15 @@ export const AvatarInputField = forwardRef(
             <EditIcon />
           </label>
         </div>
-        <Button
-          className={styles.removeButton}
-          variant="icon"
-          onPress={onPressRemoveAvatar}
-        >
-          Remove
-        </Button>
+        {(avatarUrl || objUrl) && !removed && (
+          <Button
+            className={styles.removeButton}
+            variant="icon"
+            onPress={onPressRemoveAvatar}
+          >
+            Remove
+          </Button>
+        )}
       </div>
     );
   }