diff --git a/addons/events/fnc_addPlayerEventHandler.sqf b/addons/events/fnc_addPlayerEventHandler.sqf
index ef3d4e7b0..847e7d660 100644
--- a/addons/events/fnc_addPlayerEventHandler.sqf
+++ b/addons/events/fnc_addPlayerEventHandler.sqf
@@ -124,6 +124,7 @@ if (_id != -1) then {
         GVAR(oldLoadout) = [];
         GVAR(oldLoadoutNoAmmo) = [];
         GVAR(oldVehicle) = objNull;
+        GVAR(inVehicle) = false;
         GVAR(oldTurret) = [];
         GVAR(oldVisionMode) = -1;
         GVAR(oldCameraView) = "";
@@ -185,12 +186,21 @@ if (_id != -1) then {
             if !(_data isEqualTo GVAR(oldVehicle)) then {
                 GVAR(oldVehicle) = _data;
                 [QGVAR(vehicleEvent), [_player, _data]] call CBA_fnc_localEvent;
+                GVAR(inVehicle) = _data != _player;
+                if (!GVAR(inVehicle)) then {
+                    _data = _player call CBA_fnc_turretPath;
+                    if !(_data isEqualTo GVAR(oldTurret)) then {
+                        GVAR(oldTurret) = _data;
+                        [QGVAR(turretEvent), [_player, _data]] call CBA_fnc_localEvent;
+                    };
+                };
             };
-
-            _data = _player call CBA_fnc_turretPath;
-            if !(_data isEqualTo GVAR(oldTurret)) then {
-                GVAR(oldTurret) = _data;
-                [QGVAR(turretEvent), [_player, _data]] call CBA_fnc_localEvent;
+            if (GVAR(inVehicle)) then {
+                _data = _player call CBA_fnc_turretPath;
+                if !(_data isEqualTo GVAR(oldTurret)) then {
+                    GVAR(oldTurret) = _data;
+                    [QGVAR(turretEvent), [_player, _data]] call CBA_fnc_localEvent;
+                };
             };
 
             // handle controlling UAV, UAV entity needed for visionMode