diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index dac42005a15..6fcff2d2a8b 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -105,9 +105,10 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 			if(new_value)
 				job_preferences[initial(J.title)] = new_value
 	if(current_version < 23)
-		all_quirks -= "Physically Obstructive"
-		all_quirks -= "Neat"
-		all_quirks -= "NEET"
+		if(all_quirks)
+			all_quirks -= "Physically Obstructive"
+			all_quirks -= "Neat"
+			all_quirks -= "NEET"
 
 /datum/preferences/proc/load_path(ckey,filename="preferences.sav")
 	if(!ckey)