diff --git a/addons/scopes/CfgEventHandlers.hpp b/addons/scopes/CfgEventHandlers.hpp
index 5c23e0c462..e75956f440 100644
--- a/addons/scopes/CfgEventHandlers.hpp
+++ b/addons/scopes/CfgEventHandlers.hpp
@@ -9,11 +9,3 @@ class Extended_PostInit_EventHandlers {
         init = QUOTE(call COMPILE_FILE(XEH_postInit));
     };
 };
-
-class Extended_FiredBIS_EventHandlers {
-    class CAManBase {
-        class ADDON {
-            firedBIS = QUOTE(_this call FUNC(firedEH););
-        };
-    };
-};
diff --git a/addons/scopes/XEH_postInit.sqf b/addons/scopes/XEH_postInit.sqf
index 41e7d53e17..8f2adeb0b7 100644
--- a/addons/scopes/XEH_postInit.sqf
+++ b/addons/scopes/XEH_postInit.sqf
@@ -136,3 +136,8 @@ if (!hasInterface) exitWith {};
 },
 {false},
 [201, [true, true, false]], true] call CBA_fnc_addKeybind;
+
+
+// Register fire event handler
+["firedPlayer", DFUNC(firedEH)] call EFUNC(common,addEventHandler);
+["firedPlayerNonLocal", DFUNC(firedEH)] call EFUNC(common,addEventHandler);
diff --git a/addons/scopes/functions/fnc_firedEH.sqf b/addons/scopes/functions/fnc_firedEH.sqf
index bb9c37a1af..d28c0dee7e 100644
--- a/addons/scopes/functions/fnc_firedEH.sqf
+++ b/addons/scopes/functions/fnc_firedEH.sqf
@@ -1,15 +1,9 @@
 /*
  * Author: KoffeinFlummi, esteldunedain
- * Adjusts the flight path of the bullet according to the zeroing
+ * Adjusts the flight path of the bullet according to the zeroing. Called from the unified fired EH only for local and non-local players on foot.
  *
  * Argument:
- * 0: unit - Object the event handler is assigned to <OBJECT>
- * 1: weapon - Fired weapon <STRING>
- * 2: muzzle - Muzzle that was used <STRING>
- * 3: mode - Current mode of the fired weapon <STRING>
- * 4: ammo - Ammo used <STRING>
- * 5: magazine - magazine name which was used <STRING>
- * 6: projectile - Object of the projectile that was shot <OBJECT>
+ * None. Parameters inherited from EFUNC(common,firedEH)
  *
  * Return value:
  * None
@@ -18,12 +12,11 @@
  */
 #include "script_component.hpp"
 
+//IGNORE_PRIVATE_WARNING ["_unit", "_weapon", "_muzzle", "_mode", "_ammo", "_magazine", "_projectile", "_vehicle", "_gunner", "_turret"];
+TRACE_10("firedEH:",_unit, _weapon, _muzzle, _mode, _ammo, _magazine, _projectile, _vehicle, _gunner, _turret);
+
 private ["_adjustment", "_weaponIndex", "_zeroing", "_adjustment"];
 
-params ["_unit", "", "", "", "", "", "_projectile"];
-
-if (!([_unit] call EFUNC(common,isPlayer))) exitWith {};
-
 _adjustment = _unit getVariable [QGVAR(Adjustment), []];
 if (_adjustment isEqualTo []) exitWith {};