diff --git a/MEROptimizer/Application/MEROptimizer.cs b/MEROptimizer/Application/MEROptimizer.cs
index 4e68147..765f31c 100644
--- a/MEROptimizer/Application/MEROptimizer.cs
+++ b/MEROptimizer/Application/MEROptimizer.cs
@@ -214,7 +214,10 @@ private void OnSpawned(SpawnedEventArgs ev)
     private void OnChangingSpectatedPlayer(ChangingSpectatedPlayerEventArgs ev)
     {
       if (ev.Player == null || ev.NewTarget == null) return;
-      OnPlayerChangedSpectator(ev.Player, ev.OldTarget, ev.NewTarget);
+
+      Player oldTarget = null;
+      if (ev.OldTarget != null) oldTarget = ev.OldTarget;
+      OnPlayerChangedSpectator(ev.Player, oldTarget, ev.NewTarget);
     }
 
 #else