diff --git a/scripts/server/misc.js b/scripts/server/misc.js
index c386d771..1bcd3183 100644
--- a/scripts/server/misc.js
+++ b/scripts/server/misc.js
@@ -146,7 +146,7 @@ function enterExitPropertyCommand(command, params, client) {
 					}, 2000);
 				}, 1000);
 			}, 1100);
-			removeEntityData(client, "ag.inHouse");
+			getPlayerData(client).inHouse = false;
 			return true;
 		}
 	}
@@ -177,7 +177,7 @@ function enterExitPropertyCommand(command, params, client) {
 					}, 2000);
 				}, 1000);
 			}, 1100);
-			removeEntityData(client, "ag.inBusiness");
+			getPlayerData(client).inBusiness = false;
 			logToConsole(LOG_DEBUG, `[Asshat.Misc] ${getPlayerDisplayForConsole(client)} entered business ${inBusiness.name}[${inBusiness.index}/${inBusiness.databaseId}]`);
 			return true;
 		}
@@ -212,8 +212,8 @@ function enterExitPropertyCommand(command, params, client) {
 					fadeCamera(client, true, 1.0);
 					getPlayerData(client).pedState = AG_PEDSTATE_READY;
 				}, 1000);
-			}, 1100);
-			setEntityData(client, "ag.inBusiness", closestBusinessId);
+			}, 1100);x
+			getPlayerData(client).inBusiness = closestBusinessId;
 			return true;
 		}
 	}
@@ -249,7 +249,7 @@ function enterExitPropertyCommand(command, params, client) {
 					getPlayerData(client).pedState = AG_PEDSTATE_READY;
 				}, 1000);
 			}, 1100);
-			setEntityData(client, "ag.inHouse", closestHouseId);
+			getPlayerData(client).inHouse = closestHouseId;
 			return true;
 		}
 	}