diff --git a/scripts/server/misc.js b/scripts/server/misc.js
index aab6430b..f74db179 100644
--- a/scripts/server/misc.js
+++ b/scripts/server/misc.js
@@ -200,6 +200,12 @@ function enterExitPropertyCommand(command, params, client) {
 	let isEntrance = false;
 	let isBusiness = false;
 
+	// Make sure they aren't already trying to enter/exit a property
+	if (getPlayerData(client).pedState == AGRP_PEDSTATE_ENTERINGPROPERTY || getPlayerData(client).pedState == AGRP_PEDSTATE_EXITINGPROPERTY) {
+		messagePlayerError(client, getLocaleString(client, "UnableToDoThat"));
+		return false;
+	}
+
 	if (areServerElementsSupported()) {
 		if (!getPlayerData(client).currentPickup) {
 			return false;