diff --git a/addons/recoil/CfgEventHandlers.hpp b/addons/recoil/CfgEventHandlers.hpp
index 60fc3892fc..76963cf182 100644
--- a/addons/recoil/CfgEventHandlers.hpp
+++ b/addons/recoil/CfgEventHandlers.hpp
@@ -1,14 +1,11 @@
-
 class Extended_PreInit_EventHandlers {
     class ADDON {
         init = QUOTE(call COMPILE_FILE(XEH_preInit));
     };
 };
 
-class Extended_FiredBIS_EventHandlers {
-    class CAManBase {
-        class ADDON {
-            clientFiredBIS = QUOTE(if (_this select 0 == ACE_player) then {_this call FUNC(camshake)};);
-        };
+class Extended_PostInit_EventHandlers {
+    class ADDON {
+        init = QUOTE( call COMPILE_FILE(XEH_postInit) );
     };
 };
diff --git a/addons/recoil/XEH_postInit.sqf b/addons/recoil/XEH_postInit.sqf
new file mode 100644
index 0000000000..e6b694646f
--- /dev/null
+++ b/addons/recoil/XEH_postInit.sqf
@@ -0,0 +1,4 @@
+#include "script_component.hpp"
+
+// Register fire event handler
+["firedPlayer", DFUNC(camShake)] call EFUNC(common,addEventHandler);
diff --git a/addons/recoil/functions/fnc_camshake.sqf b/addons/recoil/functions/fnc_camshake.sqf
index a8e1af75d9..deb454df71 100644
--- a/addons/recoil/functions/fnc_camshake.sqf
+++ b/addons/recoil/functions/fnc_camshake.sqf
@@ -1,12 +1,10 @@
 /*
  * Author: Orginal by Ryan Schultz, edited by KoffeinFlummi, commy2
- * Adds camera shake when firing 
+ * Adds camera shake when firing. Called from the unified fired EH only for the local player.
  * From TMR: Small Arms
  *
  * Arguments:
- * 0: Unit <OBJECT>
- * 1: Weapon <STRING>
- * 3: Muzzle <STRING>
+ * None. Parameters inherited from EFUNC(common,firedEH)
  *
  * Return Value:
  * Nothing
@@ -18,13 +16,14 @@
  */
 #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);
+
 #define BASE_POWER 0.40
 #define BASE_TIME 0.19
 #define BASE_FREQ 13
 #define RECOIL_COEF 40
 
-params ["_unit", "_weapon", "_muzzle"];
-
 if (toLower _weapon in ["throw", "put"]) exitWith {};
 
 private _powerMod = ([0, -0.1, -0.1, 0, -0.2] select (["STAND", "CROUCH", "PRONE", "UNDEFINED", ""] find stance _unit)) + ([0, -1, 0, -1] select (["INTERNAL", "EXTERNAL", "GUNNER", "GROUP"] find cameraView));