diff --git a/src/facilities/bodyModification/bodyModification.js b/src/facilities/bodyModification/bodyModification.js
index 0a58c4b87cff41042d0c782b326e8ea7f7f276e3..96ec38bc8c26a8acdfae6c6a872ece274ec4c163 100644
--- a/src/facilities/bodyModification/bodyModification.js
+++ b/src/facilities/bodyModification/bodyModification.js
@@ -242,19 +242,21 @@ App.UI.bodyModification = function(slave, cheat = false) {
 		// Determine parts that cannot be pierced
 		let validPiercingLocations = Array.from(piercingLocations);
 
-		if (slave.nipples !== "fuckable") {
-			removePiercingLocation("nipples");
-		}
+		if (piercingLevel !== 0) { // Sometimes a piercing winds up in a place that is no longer valid.  Make sure players can always remove an existing piercing.
+			if (slave.nipples !== "fuckable") {
+				removePiercingLocation("nipples");
+			}
 
-		if (slave.vagina !== -1 || slave.dick !== 0) {
-			removePiercingLocation("clit");
-			if (slave.vagina !== -1) {
+			if (slave.vagina === -1) {
 				removePiercingLocation("vagina");
 			}
-		}
 
-		if (slave.dick === 0) {
-			removePiercingLocation("dick");
+			if (slave.dick === 0) {
+				removePiercingLocation("dick");
+				if (slave.vagina === -1) {
+					removePiercingLocation("clit");
+				}
+			}
 		}
 
 		function removePiercingLocation(location) {