diff --git a/addons/laserpointer/XEH_postInit.sqf b/addons/laserpointer/XEH_postInit.sqf
index 3a8d611364..d2d1aec747 100644
--- a/addons/laserpointer/XEH_postInit.sqf
+++ b/addons/laserpointer/XEH_postInit.sqf
@@ -15,12 +15,14 @@ GVAR(greenLaserUnits) = [];
 ["CBA_settingsInitialized", {
     // If not enabled, dont't add draw eventhandler or PFEH (for performance)
     if (!GVAR(enabled)) exitWith {
+        ["ACE_acc_pointer_red", { false }] call CBA_fnc_addAttachmentCondition;
+        ["ACE_acc_pointer_green", { false }] call CBA_fnc_addAttachmentCondition;
         ["CBA_attachmentSwitched", {
             params ["_unit", "_prevItem", "_newItem", "_currWeaponType"];
             TRACE_4("CBA_attachmentSwitched eh",_unit,_prevItem,_newItem,_currWeaponType);
             if ((getNumber (configFile >> "CfgWeapons" >> _newItem >> "ACE_laserpointer")) > 0) then {
                 TRACE_1("removing ACE_laserpointer",getNumber (configFile >> "CfgWeapons" >> _newItem >> "ACE_laserpointer"));
-                [1, "prev"] call CBA_accessory_fnc_switchAttachment;
+                [1, "next"] call CBA_accessory_fnc_switchAttachment;
             };
         }] call CBA_fnc_addEventHandler;
     };