diff --git a/addons/spectator/XEH_postInit.sqf b/addons/spectator/XEH_postInit.sqf
index 4b1f653223..43c812d1a2 100644
--- a/addons/spectator/XEH_postInit.sqf
+++ b/addons/spectator/XEH_postInit.sqf
@@ -16,4 +16,14 @@ if (isServer) then {
 };
 
 // Should prevent unending spectator on mission end
-addMissionEventHandler ["Ended",{ [QGVAR(EndMission)] call FUNC(interrupt) }];
+if (isServer) then {
+    addMissionEventHandler ["Ended", {
+        [QGVAR(endMission), []] call EFUNC(common,globalEvent);
+    }];
+};
+
+[QGVAR(endMission), {
+    if (GVAR(isSet)) then {
+        [false] call FUNC(setSpectator);
+    };
+}] call EFUNC(common,addEventHandler);
diff --git a/addons/spectator/functions/fnc_setSpectator.sqf b/addons/spectator/functions/fnc_setSpectator.sqf
index ce9428cea4..1f010962b5 100644
--- a/addons/spectator/functions/fnc_setSpectator.sqf
+++ b/addons/spectator/functions/fnc_setSpectator.sqf
@@ -92,7 +92,7 @@ if (_set) then {
         if (_this) then {
             _display displayAddEventHandler ["KeyDown", {
                 if (_this select 1 == 1) then {
-                    [false] call ace_spectator_fnc_setSpectator;
+                    [false] call FUNC(setSpectator);
                     true
                 };
             }];