diff --git a/addons/spectator/functions/fnc_handleInterface.sqf b/addons/spectator/functions/fnc_handleInterface.sqf
index 777e8d2ea9..b85e73dabb 100644
--- a/addons/spectator/functions/fnc_handleInterface.sqf
+++ b/addons/spectator/functions/fnc_handleInterface.sqf
@@ -78,6 +78,7 @@ switch (toLower _mode) do {
         camDestroy GVAR(camera);
 
         // Return to player view
+        clearRadio;
         _unit switchCamera "internal";
 
         // Re-enable BI damage effects
diff --git a/addons/spectator/functions/fnc_handleUnits.sqf b/addons/spectator/functions/fnc_handleUnits.sqf
index b64a1a2717..e8cd561da0 100644
--- a/addons/spectator/functions/fnc_handleUnits.sqf
+++ b/addons/spectator/functions/fnc_handleUnits.sqf
@@ -26,9 +26,11 @@ if (isNull _display) exitWith { [_this select 1] call CBA_fnc_removePerFrameHand
 // Remove all dead and null units from the list
 [] call FUNC(updateUnits);
 
-// Camera shouldn't stay on unit that isn't in the list
+// Camera shouldn't stay on unit that isn't in the list (unless dead)
 if !(GVAR(camUnit) in GVAR(unitList)) then {
-    [nil,1] call FUNC(cycleCamera);
+    if (alive GVAR(camUnit) || isNull GVAR(camUnit)) then {
+        [nil,1] call FUNC(cycleCamera);
+    };
 };
 
 // Reduce overhead when unit tree is hidden
diff --git a/addons/spectator/functions/fnc_transitionCamera.sqf b/addons/spectator/functions/fnc_transitionCamera.sqf
index a4d99445fb..4957540fa4 100644
--- a/addons/spectator/functions/fnc_transitionCamera.sqf
+++ b/addons/spectator/functions/fnc_transitionCamera.sqf
@@ -33,7 +33,7 @@ if !(_newMode in GVAR(availableModes)) then {
 };
 
 // When no units available to spectate, exit to freecam
-if (GVAR(unitList) isEqualTo []) then {
+if ((GVAR(unitList) isEqualTo []) && (alive _newUnit || isNull _newUnit)) then {
     _newMode = 0;
     _newUnit = objNull;
 };