diff --git a/addons/common/functions/fnc_getAllGear.sqf b/addons/common/functions/fnc_getAllGear.sqf
index 33c23c98a3..aa2289309e 100644
--- a/addons/common/functions/fnc_getAllGear.sqf
+++ b/addons/common/functions/fnc_getAllGear.sqf
@@ -18,7 +18,6 @@
  * 14-16: pistol (String, Array, Array)
  *    17: map, compass, watch, etc. (Array)
  *    18: binocluar (String)
- *    19: active weapon, active muzzle, active weaponMode (Array)
  *
  */
 #include "script_component.hpp"
@@ -35,8 +34,7 @@ if (isNull _unit) exitWith {[
     "", ["","","",""], [],
     "", ["","","",""], [],
     [],
-    "",
-    ["","",""]
+    ""
 ]};
 
 [
@@ -49,6 +47,5 @@ if (isNull _unit) exitWith {[
     secondaryWeapon _unit, secondaryWeaponItems _unit, secondaryWeaponMagazine _unit,
     handgunWeapon _unit, handgunItems _unit, handgunMagazine _unit,
     assignedItems _unit,
-    binocular _unit,
-    [currentWeapon _unit, currentMuzzle _unit, currentWeaponMode _unit]
+    binocular _unit
 ]
diff --git a/addons/respawn/functions/fnc_handleKilled.sqf b/addons/respawn/functions/fnc_handleKilled.sqf
index 1fea488421..99ec308c1c 100644
--- a/addons/respawn/functions/fnc_handleKilled.sqf
+++ b/addons/respawn/functions/fnc_handleKilled.sqf
@@ -25,6 +25,7 @@ if (ACE_player == _killedUnit) then {
 
     if (GVAR(SavePreDeathGear)) then {
         GVAR(unitGear) = [_killedUnit] call EFUNC(common,getAllGear);
+        GVAR(unitGear) pushBack [currentWeapon _killedUnit, currentMuzzle _killedUnit, currentWeaponMode _killedUnit];
     };
 };