diff --git a/[core]/es_extended/client/main.lua b/[core]/es_extended/client/main.lua
index 32fe238a..e197e46b 100644
--- a/[core]/es_extended/client/main.lua
+++ b/[core]/es_extended/client/main.lua
@@ -74,31 +74,7 @@ AddEventHandler('esx:playerLoaded', function(xPlayer, isNew, skin)
 		end
 	end
 
-	-- DisableVehicleRewards
-	if Config.DisableVehicleRewards then
-		local inVehicle = false
-
-		local function DisableVehicleRewardsThread()
-			CreateThread(function()
-				while inVehicle do
-					DisablePlayerVehicleRewards(playerId)
-					Wait(0)
-				end
-			end)
-		end
-
-		AddEventHandler('esx:enteredVehicle', function(vehicle, plate, seat, displayName, netId)
-			if GetVehicleClass(vehicle) == 18 then
-				DisableVehicleRewardsThread()
-			end
-		end)
-
-		AddEventHandler('esx:exitedVehicle', function(vehicle, plate, seat, displayName, netId)
-			inVehicle = false
-		end)
-	end
-
-	if Config.DisableHealthRegeneration or Config.DisableWeaponWheel or Config.DisableAimAssist then
+	if Config.DisableHealthRegeneration or Config.DisableWeaponWheel or Config.DisableAimAssist or Config.DisableVehicleRewards then
 		CreateThread(function()
 			while true do
 				if Config.DisableHealthRegeneration then
@@ -115,6 +91,10 @@ AddEventHandler('esx:playerLoaded', function(xPlayer, isNew, skin)
 						SetPlayerLockonRangeOverride(playerId, 2.0)
 					end
 				end
+				
+				if Config.DisableVehicleRewards then
+					DisablePlayerVehicleRewards(playerId)
+				end
 
 				Wait(0)
 			end