diff --git a/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf b/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf
index 26f9e4e2..3d18bc4c 100644
--- a/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf
+++ b/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf
@@ -139,13 +139,6 @@ if (!isNull _player) then {
 
 		_group = grpNull;
 
-		// Delete any left over units with same PUID
-		{
-			if ((_x getVariable["PUID", "0"]) == _playerUID) then {
-				deleteVehicle _x;
-			};
-		} forEach allUnits;
-
 		// find existing group
 		if (_playerGroup != "") then {
 			{
diff --git a/Sources/epoch_server/compile/epoch_player/EPOCH_server_onPlayerDisconnect.sqf b/Sources/epoch_server/compile/epoch_player/EPOCH_server_onPlayerDisconnect.sqf
index 5caedad3..fc3bfc27 100644
--- a/Sources/epoch_server/compile/epoch_player/EPOCH_server_onPlayerDisconnect.sqf
+++ b/Sources/epoch_server/compile/epoch_player/EPOCH_server_onPlayerDisconnect.sqf
@@ -28,6 +28,12 @@ if (!isNull _player) then {
 		deleteVehicle _player;
 	};
 };
+// Delete any left over units with same PUID
+{
+    if ((_x getVariable["PUID", "0"]) == _uid) then {
+        deleteVehicle _x;
+    };
+} forEach allUnits;
 _uid call EPOCH_server_disconnect;
 ['Disconnected', [_uid, _name]] call EPOCH_fnc_server_hiveLog;
 _return