diff --git a/src/js/statsChecker/eyeChecker.js b/src/js/statsChecker/eyeChecker.js
index 7014da62b7795bf87b7c6b899a76f2d49f28e18c..d7d8ed835d660683457063c377843de13ef74f14 100644
--- a/src/js/statsChecker/eyeChecker.js
+++ b/src/js/statsChecker/eyeChecker.js
@@ -265,9 +265,8 @@ globalThis.hasVisibleHeterochromia = function(slave) {
 globalThis.getGeneticEyeColor = function(playerOrSlave, side) {
 	if (side !== "left" && side !== "right") { return "ERROR:" + side; }
 
-	if (playerOrSlave.geneticQuirks.albinism === 2) {
-		const slave = (/** @type {App.Entity.SlaveState} */(playerOrSlave));
-		return slave.albinismOverride && slave.albinismOverride.eyeColor;
+	if (playerOrSlave.geneticQuirks.albinism === 2 && "albinismOverride" in playerOrSlave) {
+		return playerOrSlave.albinismOverride.eyeColor;
 	} else {
 		if (side === "left" && typeof playerOrSlave.geneticQuirks.heterochromia === "string") {
 			return playerOrSlave.geneticQuirks.heterochromia;
diff --git a/src/npc/generate/generateNewSlaveJS.js b/src/npc/generate/generateNewSlaveJS.js
index 6c995b5c639363cab10e6b204c09d83d026644f6..8210cb6adef753f896137355309b0eeba5e367c1 100644
--- a/src/npc/generate/generateNewSlaveJS.js
+++ b/src/npc/generate/generateNewSlaveJS.js
@@ -1711,32 +1711,7 @@ globalThis.GenerateNewSlave = (function() {
 
 	function generateGeneticQuirkTweaks() {
 		if (slave.geneticQuirks.albinism === 2) {
-			slave.albinismOverride = {
-				skin: 0,
-				eyeColor: "red",
-				hColor: "white"
-			};
-			switch (slave.race) {
-				case "black":
-				case "indo-aryan":
-				case "malay":
-				case "pacific islander":
-				case "amerindian":
-					slave.albinismOverride.skin = "very fair";
-					break;
-				case "latina":
-					slave.albinismOverride.skin = "extremely fair";
-					break;
-				case "asian":
-				case "middle eastern":
-				case "semitic":
-				case "southern european":
-				case "white":
-					slave.albinismOverride.skin = "pure white";
-					break;
-				default:
-					slave.albinismOverride.skin = "pure white";
-			}
+			slave.albinismOverride = makeAlbinismOverride(slave.race);
 		}
 		if (slave.geneticQuirks.rearLipedema === 2) {
 			slave.butt += jsRandom(0.2 * slave.physicalAge, 0.5 * slave.physicalAge);
diff --git a/src/npc/surgery/surgery.js b/src/npc/surgery/surgery.js
index d2a0f56ce704f8a411166d2c3ded2eac986d9eb5..a9343bd4d425e00c15e98c3432b11fd42a62c1a2 100644
--- a/src/npc/surgery/surgery.js
+++ b/src/npc/surgery/surgery.js
@@ -790,7 +790,7 @@ globalThis.resetEyeColor = function(slave, side = "both") {
 
 /**
  * @param {App.Entity.SlaveState} slave
- * @param {number} level
+ * @param {FC.GeneticQuirk} level
  */
 globalThis.induceAlbinism = function(slave, level) {
 	slave.geneticQuirks.albinism = level;
@@ -798,32 +798,7 @@ globalThis.induceAlbinism = function(slave, level) {
 		slave.albinismOverride = null;
 		return;
 	}
-	slave.albinismOverride = {
-		skin: 0,
-		eyeColor: "red",
-		hColor: "white"
-	};
-	switch (slave.race) {
-		case "black":
-		case "indo-aryan":
-		case "malay":
-		case "pacific islander":
-		case "amerindian":
-			slave.albinismOverride.skin = "very fair";
-			break;
-		case "latina":
-			slave.albinismOverride.skin = "extremely fair";
-			break;
-		case "asian":
-		case "middle eastern":
-		case "semitic":
-		case "southern european":
-		case "white":
-			slave.albinismOverride.skin = "pure white";
-			break;
-		default:
-			slave.albinismOverride.skin = "pure white";
-	}
+	slave.albinismOverride = makeAlbinismOverride(slave.race);
 };
 
 /**