diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index 4487b6e657202246e27b762cf44b62aee27d6e7c..2cc0da46cacd8b2148b8bf7d605453db46dfb002 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -1390,6 +1390,21 @@ window.ArcologyDatatypeCleanup = function ArcologyDatatypeCleanup() {
 	V.TFS.schoolProsperity = Math.clamp(+V.TFS.schoolProsperity, -10, 10) || 0;
 };
 
+function FacilityDecorationCleanup() {
+	ValidateFacilityDecoration("brothelDecoration");
+	ValidateFacilityDecoration("dairyDecoration");
+	ValidateFacilityDecoration("clubDecoration");
+	ValidateFacilityDecoration("servantsQuartersDecoration");
+	ValidateFacilityDecoration("schoolroomDecoration");
+	ValidateFacilityDecoration("spaDecoration");
+	ValidateFacilityDecoration("clinicDecoration");
+	ValidateFacilityDecoration("arcadeDecoration");
+	ValidateFacilityDecoration("cellblockDecoration");
+	ValidateFacilityDecoration("masterSuiteDecoration");
+	ValidateFacilityDecoration("nurseryDecoration");
+	ValidateFacilityDecoration("farmyardDecoration");
+};
+
 window.FacilityDatatypeCleanup = (function() {
 	"use strict";
 	let V;
@@ -1437,21 +1452,6 @@ window.FacilityDatatypeCleanup = (function() {
 		helperFunction(V.FarmyardiIDs);
 	}
 
-	function FacilityDecorationCleanup() {
-		ValidateFacilityDecoration("brothelDecoration");
-		ValidateFacilityDecoration("dairyDecoration");
-		ValidateFacilityDecoration("clubDecoration");
-		ValidateFacilityDecoration("servantsQuartersDecoration");
-		ValidateFacilityDecoration("schoolroomDecoration");
-		ValidateFacilityDecoration("spaDecoration");
-		ValidateFacilityDecoration("clinicDecoration");
-		ValidateFacilityDecoration("arcadeDecoration");
-		ValidateFacilityDecoration("cellblockDecoration");
-		ValidateFacilityDecoration("masterSuiteDecoration");
-		ValidateFacilityDecoration("nurseryDecoration");
-		ValidateFacilityDecoration("farmyardDecoration");
-	}
-
 	function FacilityNameCleanup() {
 		V.arcologies[0].name = V.arcologies[0].name || "Arcology X-4";
 		V.brothelName = V.brothelName || "the Brothel";
diff --git a/src/js/storyJS.js b/src/js/storyJS.js
index 9dec944bdddf40e70036f79a846c706d5979954d..9ae5a465beed6d57101cbab2e34e65bca10e3c02 100644
--- a/src/js/storyJS.js
+++ b/src/js/storyJS.js
@@ -918,6 +918,7 @@ window.removeFS = function(FS) {
 		}
 	}
 	arcology[FS] = "unset";
+	FacilityDecorationCleanup();
 	resetFSCredits();
 };