diff --git a/app/features/badges/components/BadgesSelector.tsx b/app/features/badges/components/BadgesSelector.tsx
index f3140d7fa..772c92bd4 100644
--- a/app/features/badges/components/BadgesSelector.tsx
+++ b/app/features/badges/components/BadgesSelector.tsx
@@ -11,6 +11,7 @@ export function BadgesSelector({
 	onBlur,
 	children,
 	maxCount,
+	showSelect = true,
 }: {
 	options: BadgeDisplayProps["badges"];
 	selectedBadges: number[];
@@ -18,6 +19,7 @@ export function BadgesSelector({
 	onBlur?: () => void;
 	children?: React.ReactNode;
 	maxCount?: number;
+	showSelect?: boolean;
 }) {
 	const { t } = useTranslation(["common"]);
 
@@ -43,21 +45,25 @@ export function BadgesSelector({
 					{t("common:badges.selector.none")}
 				</div>
 			)}
-			<select
-				onBlur={onBlur}
-				onChange={(e) => onChange([...selectedBadges, Number(e.target.value)])}
-				disabled={Boolean(maxCount && selectedBadges.length >= maxCount)}
-				data-testid="badges-selector"
-			>
-				<option>{t("common:badges.selector.select")}</option>
-				{options
-					.filter((badge) => !selectedBadges.includes(badge.id))
-					.map((badge) => (
-						<option key={badge.id} value={badge.id}>
-							{badge.displayName}
-						</option>
-					))}
-			</select>
+			{showSelect ? (
+				<select
+					onBlur={onBlur}
+					onChange={(e) =>
+						onChange([...selectedBadges, Number(e.target.value)])
+					}
+					disabled={Boolean(maxCount && selectedBadges.length >= maxCount)}
+					data-testid="badges-selector"
+				>
+					<option>{t("common:badges.selector.select")}</option>
+					{options
+						.filter((badge) => !selectedBadges.includes(badge.id))
+						.map((badge) => (
+							<option key={badge.id} value={badge.id}>
+								{badge.displayName}
+							</option>
+						))}
+				</select>
+			) : null}
 		</div>
 	);
 }
diff --git a/app/features/user-page/routes/u.$identifier.edit.tsx b/app/features/user-page/routes/u.$identifier.edit.tsx
index 200735e18..a2bfca944 100644
--- a/app/features/user-page/routes/u.$identifier.edit.tsx
+++ b/app/features/user-page/routes/u.$identifier.edit.tsx
@@ -415,6 +415,7 @@ function FavBadgeSelect() {
 				selectedBadges={value}
 				onChange={onChange}
 				maxCount={BADGE.SMALL_BADGES_PER_DISPLAY_PAGE + 1}
+				showSelect={isSupporter || value.length === 0}
 			>
 				{!isSupporter ? (
 					<div className="text-sm text-lighter font-semi-bold text-center">