diff --git a/client/weed.lua b/client/weed.lua
index ec462ef1..658817fc 100644
--- a/client/weed.lua
+++ b/client/weed.lua
@@ -49,11 +49,11 @@ end)
 function ProcessWeed(xCannabis)
 	isProcessing = true
 	ESX.ShowNotification(_U('weed_processingstarted'))
-	TriggerServerEvent('esx_drugs:processCannabis')
-	if(xCannabis<3) then
-		xCannabis=0
+  TriggerServerEvent('esx_drugs:processCannabis')
+	if(xCannabis <= 3) then
+		xCannabis = 0
 	end
-	local timeLeft = (Config.Delays.WeedProcessing * xCannabis) / 1000
+  local timeLeft = (Config.Delays.WeedProcessing * xCannabis) / 1000
 	local playerPed = PlayerPedId()
 
 	while timeLeft > 0 do
diff --git a/server/main.lua b/server/main.lua
index 72e9472f..10730cf2 100644
--- a/server/main.lua
+++ b/server/main.lua
@@ -88,21 +88,20 @@ end)
 
 RegisterServerEvent('esx_drugs:processCannabis')
 AddEventHandler('esx_drugs:processCannabis', function()
-	if not playersProcessingCannabis[source] then
+  if not playersProcessingCannabis[source] then
 		local _source = source
 		local xPlayer = ESX.GetPlayerFromId(_source)
 		local xCannabis = xPlayer.getInventoryItem('cannabis')
-		TriggerClientEvent('esx_drugs:getPlayer',xCannabis.count,_source)
 		local can = true
 		outofbound = false
-		if xCannabis.count >=3 then
-			while outofbound == false and can and GetEntityHealth(GetPlayerPed(_source))>0 do
+    if xCannabis.count >= 3 then
+      while outofbound == false and can do
 				if playersProcessingCannabis[_source] == nil then
 					playersProcessingCannabis[_source] = ESX.SetTimeout(Config.Delays.WeedProcessing , function()
-						if xCannabis.count >= 3 then
-							if xPlayer.canSwapItem('cannabis', 3, 'marijuana', 1) then
-								xPlayer.removeInventoryItem('cannabis', 3)
-								xPlayer.addInventoryItem('marijuana', 1)
+            if xCannabis.count >= 3 then
+              if xPlayer.canSwapItem('cannabis', 3, 'marijuana', 1) then
+                xPlayer.removeInventoryItem('cannabis', 3)
+                xPlayer.addInventoryItem('marijuana', 1)
 								xPlayer.showNotification(_U('weed_processed'))
 							else
 								can = false