diff --git a/internal/api/resolver_mutation_configure.go b/internal/api/resolver_mutation_configure.go
index d677ec262..30f6289f8 100644
--- a/internal/api/resolver_mutation_configure.go
+++ b/internal/api/resolver_mutation_configure.go
@@ -64,8 +64,8 @@ func (r *mutationResolver) setConfigString(key string, value *string) {
 
 // applyDefaultPerformerGenderInput updates or clears DefaultPerformerGender.
 // Omit both fields to leave the stored value unchanged.
-func (r *mutationResolver) applyDefaultPerformerGenderInput(value *models.GenderEnum, clear *bool) error {
-	if clear != nil && *clear {
+func (r *mutationResolver) applyDefaultPerformerGenderInput(value *models.GenderEnum, shouldClear *bool) error {
+	if shouldClear != nil && *shouldClear {
 		if value != nil {
 			return fmt.Errorf("cannot set and clear default performer gender in the same request")
 		}
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
index 73485b012..1fe5643b6 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
@@ -59,12 +59,12 @@ const isScraper = (
 ): scraper is GQL.Scraper => (scraper as GQL.Scraper).id !== undefined;
 
 function withScrapedPerformerDefaultGender<
-  T extends { gender?: GQL.GenderEnum | null }
+  T extends { gender?: string | null }
 >(scraped: T, defaultGender: GQL.GenderEnum | null | undefined): T {
   if (scraped.gender || !defaultGender) {
     return scraped;
   }
-  return { ...scraped, gender: defaultGender };
+  return { ...scraped, gender: defaultGender } as T;
 }
 
 interface IPerformerDetails {