diff --git a/src/js/itemAvailability.js b/src/js/itemAvailability.js
index 86634c4914d09cf9d8644ae4408c88702238c8b1..546d16e0f1bf19fbb2859827bf4d03a7e6f14c7e 100644
--- a/src/js/itemAvailability.js
+++ b/src/js/itemAvailability.js
@@ -288,6 +288,12 @@ window.isClothingAccessible = (function() {
 	}
 
 	function isAvailable(item, category, slave) {
+		if (slave) {
+			let slaveResults = isAvailableForSlave(item, category, slave);
+			if (slaveResults !== true) { // If they are true we pass this check but want to run the others.
+				return slaveResults;
+			}
+		}
 		if (!(item.hasOwnProperty("fs")) && !(item.hasOwnProperty("rs"))) {
 			// No restriction, this clothing item is available to everyone
 			return true;
@@ -346,9 +352,6 @@ window.isClothingAccessible = (function() {
 				return false;
 			}
 		}
-		if (slave) {
-			return isAvailableForSlave(item, category, slave);
-		}
 		return true;
 	}