diff --git a/addons/laser_selfdesignate/functions/fnc_laserHudDesignateOn.sqf b/addons/laser_selfdesignate/functions/fnc_laserHudDesignateOn.sqf
index 417744fd46..ea9cd201cc 100644
--- a/addons/laser_selfdesignate/functions/fnc_laserHudDesignateOn.sqf
+++ b/addons/laser_selfdesignate/functions/fnc_laserHudDesignateOn.sqf
@@ -35,7 +35,10 @@ FUNC(laserHudDesignatePFH) = {
     TRACE_1("", _args);
     
     if(!alive _shooter || isNull _vehicle || isNull _laserTarget || !GVAR(laserActive) ) exitWith { 
-        [(_this select 1)] call cba_fnc_removePerFrameHandler; 
+        [] call FUNC(laserHudDesignateOff);
+    };
+    if(!([ACE_player] call FUNC(unitTurretHasDesignator)) ) exitWith {
+        [] call FUNC(laserHudDesignateOff);
     };
     
     // Retrieve the gunner and turret memory point information