diff --git a/src/npc/generate/slaveGenerationJS.js b/src/npc/generate/slaveGenerationJS.js
index d48bafc181e9b08b80317d5dbe1dbd313d548bfb..7401c98f40e170696a9e3d0f5af056e756654616 100644
--- a/src/npc/generate/slaveGenerationJS.js
+++ b/src/npc/generate/slaveGenerationJS.js
@@ -1352,12 +1352,11 @@ globalThis.checkForGingering = function() {
 	V.gingering = 0;
 	V.gingeringDetected = 0;
 	V.gingeringDetection = 0;
-	V.toSearch = V.activeSlave.origin;
 	if (V.applyLaw === 1 && V.policies.SMR.honestySMR === 1) {
 		/* SMR prohibits gingering and is enforced for this slave - do nothing */
 	} else if (V.activeSlave.indenture > 0) {
 		/* indentured servants cannot be gingered */
-	} else if (V.toSearch !== 0 && V.toSearch.includes("Shelter")) {
+	} else if (isShelterSlave(V.activeSlave)) {
 		/* is a Shelter slave - do nothing */
 	} else {
 		V.beforeGingering = clone(V.activeSlave);