diff --git a/SQF/dayz_server/system/server_monitor.sqf b/SQF/dayz_server/system/server_monitor.sqf
index 5f738efec..783e38e21 100644
--- a/SQF/dayz_server/system/server_monitor.sqf
+++ b/SQF/dayz_server/system/server_monitor.sqf
@@ -268,9 +268,9 @@ if ((playersNumber west + playersNumber civilian) == 0) exitWith {
 		if (_isSafeObject && !_isTrapItem) then {
 			_object setVariable["memDir",_dir,true];
 			if (DZE_GodModeBase && {!(_type in DZE_GodModeBaseExclude)}) then {
-				_object addEventHandler ["HandleDamage",{false}];
+				_object addEventHandler ["HandleDamage",{0}];
 			} else {
-				_object addMPEventHandler ["MPKilled",{_this call vehicle_handleServerKilled;}];
+				_object addMPEventHandler ["MPKilled",{if !(isServer) exitWith {};_this call vehicle_handleServerKilled;}];
 			};
 		} else {
 			_object enableSimulation true;