diff --git a/scripts/server/native/connected.js b/scripts/server/native/connected.js
index 15d2f699..b42e70b6 100644
--- a/scripts/server/native/connected.js
+++ b/scripts/server/native/connected.js
@@ -1128,8 +1128,8 @@ function getClosestCivilian(position) {
 // ===========================================================================
 
 function getVehiclesInRange(position, range) {
-	if (getGame() == AGRP_GAME_GTA_IV) {
-		return getServerData().vehicles.reduce((i, j) => (getDistance(position, i.syncPosition) <= getDistance(position, j.syncPosition)) ? i : j);
+	if (!areServerElementsSupported()) {
+		return getServerData().vehicles.filter(x => getDistance(position, x.syncPosition) <= distance);
 	}
 	return getElementsByTypeInRange(ELEMENT_VEHICLE, position, range);
 }
@@ -1137,6 +1137,9 @@ function getVehiclesInRange(position, range) {
 // ===========================================================================
 
 function getClosestVehicle(position) {
+	if (!areServerElementsSupported()) {
+		getServerData().vehicles.reduce((i, j) => (getDistance(position, i.syncPosition) <= getDistance(position, j.syncPosition)) ? i : j);
+	}
 	return getClosestElementByType(ELEMENT_VEHICLE, position);
 }