diff --git a/addons/spectator/functions/fnc_handleInterface.sqf b/addons/spectator/functions/fnc_handleInterface.sqf
index 114f4e163b..255d282983 100644
--- a/addons/spectator/functions/fnc_handleInterface.sqf
+++ b/addons/spectator/functions/fnc_handleInterface.sqf
@@ -57,6 +57,8 @@ switch (toLower _mode) do {
         };
     };
     case "close": {
+        _args params ["_unit"];
+
         // Can't close a second time
         if !(GVAR(open)) exitWith {};
         GVAR(open) = false;
@@ -71,7 +73,7 @@ switch (toLower _mode) do {
         camDestroy GVAR(camera);
 
         // Return to player view
-        ACE_Player switchCamera "internal";
+        _unit switchCamera "internal";
 
         // Cleanup camera variables
         GVAR(camera) = nil;
diff --git a/addons/spectator/functions/fnc_setSpectator.sqf b/addons/spectator/functions/fnc_setSpectator.sqf
index 2f8e1d3c2d..b6e85926c5 100644
--- a/addons/spectator/functions/fnc_setSpectator.sqf
+++ b/addons/spectator/functions/fnc_setSpectator.sqf
@@ -36,7 +36,7 @@ if !(local _unit) exitwith {
 if (_set) then {
     ["open"] call FUNC(handleInterface);
 } else {
-    ["close"] call FUNC(handleInterface);
+    ["close",_unit] call FUNC(handleInterface);
 };
 
 // Handle common addon audio