diff --git a/addons/spectator/functions/fnc_updateCameraModes.sqf b/addons/spectator/functions/fnc_updateCameraModes.sqf
index de1611823b..819636ee22 100644
--- a/addons/spectator/functions/fnc_updateCameraModes.sqf
+++ b/addons/spectator/functions/fnc_updateCameraModes.sqf
@@ -21,6 +21,10 @@
 
 #include "script_component.hpp"
 
+if !(EGVAR(common,settingsInitFinished)) exitWith {
+    EGVAR(common,runAtSettingsInitialized) pushBack [DFUNC(updateCameraModes),_this];
+};
+
 params [["_addModes",[],[[]]], ["_removeModes",[],[[]]]];
 private ["_newModes","_currentModes"];
 
diff --git a/addons/spectator/functions/fnc_updateVisionModes.sqf b/addons/spectator/functions/fnc_updateVisionModes.sqf
index c2bbb09167..6db965af3e 100644
--- a/addons/spectator/functions/fnc_updateVisionModes.sqf
+++ b/addons/spectator/functions/fnc_updateVisionModes.sqf
@@ -29,6 +29,10 @@
 
 #include "script_component.hpp"
 
+if !(EGVAR(common,settingsInitFinished)) exitWith {
+    EGVAR(common,runAtSettingsInitialized) pushBack [DFUNC(updateVisionModes),_this];
+};
+
 params [["_addModes",[],[[]]], ["_removeModes",[],[[]]]];
 private ["_newModes","_currentModes"];