diff --git a/addons/zeus/CfgEventHandlers.hpp b/addons/zeus/CfgEventHandlers.hpp
index 6af3e0ef56b..becf3950523 100644
--- a/addons/zeus/CfgEventHandlers.hpp
+++ b/addons/zeus/CfgEventHandlers.hpp
@@ -16,11 +16,3 @@ class Extended_PostInit_EventHandlers {
         init = QUOTE(call COMPILE_FILE(XEH_postInit));
     };
 };
-
-class Extended_InitPost_EventHandlers {
-    class AllVehicles {
-        class ADDON {
-            serverInit = QUOTE(call FUNC(addObjectToCurator));
-        };
-    };
-};
diff --git a/addons/zeus/XEH_postInit.sqf b/addons/zeus/XEH_postInit.sqf
index c6ca2597893..9062ae5e9a4 100644
--- a/addons/zeus/XEH_postInit.sqf
+++ b/addons/zeus/XEH_postInit.sqf
@@ -1,5 +1,12 @@
 #include "script_component.hpp"
 
+["ace_settingsInitialized",{
+    // Only add an InitPost EH if setting is enabled (and apply retroactively)
+    if (isServer && GVAR(autoAddObjects)) then {
+        ["AllVehicles", "InitPost", FUNC(addObjectToCurator), true, [], true] call CBA_fnc_addClassEventHandler;
+    };
+}] call CBA_fnc_addEventHandler;
+
 // Global skill module PVs values for persistence, just listen for the PV
 QGVAR(GlobalSkillAI) addPublicVariableEventHandler FUNC(moduleGlobalSetSkill);
 
diff --git a/addons/zeus/functions/fnc_addObjectToCurator.sqf b/addons/zeus/functions/fnc_addObjectToCurator.sqf
index d727bb68263..cab5b3da6f5 100644
--- a/addons/zeus/functions/fnc_addObjectToCurator.sqf
+++ b/addons/zeus/functions/fnc_addObjectToCurator.sqf
@@ -15,11 +15,6 @@
 
 params ["_object"];
 
-if !(EGVAR(common,settingsInitFinished)) exitWith {
-    TRACE_1("pushing to runAtSettingsInitialized", _this);
-    EGVAR(common,runAtSettingsInitialized) pushBack [FUNC(addObjectToCurator), _this];
-};
-
 if (!(_object getVariable [QGVAR(addObject), GVAR(autoAddObjects)])) exitWith {};
 
 [{