diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index 38238dc5e8fac3f48a230242c4bcebdcc2e5ccf2..0e7768d253f8b21ae0e73bd18a7d16adf0c55349 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -2480,6 +2480,20 @@ App.Entity.Utils.RARuleDatatypeCleanup = function() {
 		} else {
 			set.weight = null;
 		}
+
+		// Fix particular rules where a setting might no longer be valid
+		if (set.drug === "none") {
+			set.drug = "no drugs";
+		}
+		if (set.brandDesign === "") {
+			set.brandDesign = null;
+		}
+		if (set.label === "") {
+			set.label = null;
+		}
+		if (set.removeLabel === "") {
+			set.removeLabel = null;
+		}
 	}
 }();