diff --git a/[core]/es_extended/client/main.lua b/[core]/es_extended/client/main.lua
index 8d079d5d..4ba09f96 100644
--- a/[core]/es_extended/client/main.lua
+++ b/[core]/es_extended/client/main.lua
@@ -680,10 +680,6 @@ AddEventHandler("esx:repairPedVehicle", function()
 		end
 		local ped = ESX.PlayerData.ped
 		local vehicle = GetVehiclePedIsIn(ped, false)
-		if not vehicle or GetPedInVehicleSeat(vehicle, -1) ~= ped  then
-			ESX.ShowNotification(TranslateCap('not_in_vehicle'), true, false, 140)
-			return
-		end
 		SetVehicleEngineHealth(vehicle, 1000)
 		SetVehicleEngineOn(vehicle, true, true)
 		SetVehicleFixed(vehicle)
diff --git a/[core]/es_extended/server/commands.lua b/[core]/es_extended/server/commands.lua
index eda32082..f6f5cb51 100644
--- a/[core]/es_extended/server/commands.lua
+++ b/[core]/es_extended/server/commands.lua
@@ -133,6 +133,12 @@ end, false, {
 })
 
 ESX.RegisterCommand('repair', 'admin', function(xPlayer, args, showError)
+	local ped = GetPlayerPed(xPlayer.source)
+	local pedVehicle = GetVehiclePedIsIn(ped, false)
+	if not pedVehicle or GetPedInVehicleSeat(pedVehicle, -1) ~= ped then
+		return
+		showError(TranslateCap('not_in_vehicle'))
+	end
 	xPlayer.triggerEvent("esx:repairPedVehicle")
 end, false, {help = TranslateCap('command_repair'), validate = false})