diff --git a/addons/javelin/CfgWeapons.hpp b/addons/javelin/CfgWeapons.hpp
index 868b77c36c..45c8c5942c 100644
--- a/addons/javelin/CfgWeapons.hpp
+++ b/addons/javelin/CfgWeapons.hpp
@@ -38,6 +38,9 @@ class CfgWeapons {
         lockingTargetSound[] = {"",0,1};
         lockedTargetSound[] = {"",0,1};
     };
+    class launch_B_Titan_short_tna_F: launch_B_Titan_short_F {
+        GVAR(enabled) = 1;
+    };
     class launch_I_Titan_short_F: launch_Titan_short_base {
         GVAR(enabled) = 1;
         weaponInfoType = "ACE_RscOptics_javelin";
@@ -59,6 +62,9 @@ class CfgWeapons {
         lockingTargetSound[] = {"",0,1};
         lockedTargetSound[] = {"",0,1};
     };
+    class launch_O_Titan_short_ghex_F: launch_O_Titan_short_F {
+        GVAR(enabled) = 1;
+    };
     class launch_Titan_short_F: launch_Titan_short_base {
         GVAR(enabled) = 1;
         weaponInfoType = "ACE_RscOptics_javelin";
diff --git a/addons/missileguidance/functions/fnc_onFired.sqf b/addons/missileguidance/functions/fnc_onFired.sqf
index e1e966b793..2a263721de 100644
--- a/addons/missileguidance/functions/fnc_onFired.sqf
+++ b/addons/missileguidance/functions/fnc_onFired.sqf
@@ -70,12 +70,6 @@ if(isNil "_target") then {
     };
 };
 
-//ToDo: Add correct configs for new apex titans (in ace_javelin)
-if ((isNil "_target") && {(_weapon == "launch_B_Titan_short_tna_F") || {_weapon == "launch_O_Titan_short_ghex_F"}}) then {
-    ACE_LOGWARNING_1("APEX Launcher [%1] not supported - Wait for ACE 3.6.1",_weapon);
-    if (!isNull cursorObject) then {_target = cursorObject;}; //Attempt to give some kind of target or it will
-};
-
 TRACE_4("Beginning ACE guidance system",_target,_ammo,_seekerType,_attackProfile);
 _args = [_this,
             [_shooter,