diff --git a/[gameplay]/freeroam/fr_client.lua b/[gameplay]/freeroam/fr_client.lua
index a08cef36c..5cde498d2 100644
--- a/[gameplay]/freeroam/fr_client.lua
+++ b/[gameplay]/freeroam/fr_client.lua
@@ -2130,7 +2130,9 @@ addEventHandler("onClientElementDestroy", root, onExitVehicle)
 
 function killLocalPlayer()
 	if g_settings["kill"] then
-		setElementHealth(localPlayer,0)
+		if (not isPedDead(localPlayer)) then
+			triggerServerEvent("onFreeroamSuicide", localPlayer)
+		end
 	else
 		errMsg("Killing yourself is disallowed!")
 	end
diff --git a/[gameplay]/freeroam/fr_server.lua b/[gameplay]/freeroam/fr_server.lua
index 2a2b35123..9f35ded7e 100644
--- a/[gameplay]/freeroam/fr_server.lua
+++ b/[gameplay]/freeroam/fr_server.lua
@@ -604,3 +604,10 @@ function getPlayerName(player)
 end
 
 addEvent("onFreeroamLocalSettingChange",true)
+
+addEvent('onFreeroamSuicide', true)
+addEventHandler('onFreeroamSuicide', root, function ()
+	if isElement(client) and (not isPedDead(client)) then
+		killPed(client, client)
+	end
+end)