diff --git a/Content.Server/DeltaV/Objectives/Components/PickRandomTraitorComponent.cs b/Content.Server/DeltaV/Objectives/Components/PickRandomTraitorComponent.cs
index d0cf14e51db..8f870ed7738 100644
--- a/Content.Server/DeltaV/Objectives/Components/PickRandomTraitorComponent.cs
+++ b/Content.Server/DeltaV/Objectives/Components/PickRandomTraitorComponent.cs
@@ -5,7 +5,5 @@ namespace Content.Server.DeltaV.Objectives.Components;
 /// <summary>
 /// Sets the target for <see cref="TargetObjectiveComponent"/> to a random traitor.
 /// </summary>
-[RegisterComponent, Access(typeof(KillPersonConditionSystem))]
-public sealed partial class PickRandomTraitorComponent : Component
-{
-}
+[RegisterComponent]
+public sealed partial class PickRandomTraitorComponent : Component;
diff --git a/Content.Server/DeltaV/Objectives/Systems/KillFellowTraitorObjectiveSystem.cs b/Content.Server/DeltaV/Objectives/Systems/KillFellowTraitorObjectiveSystem.cs
index 4eeba585ebe..781040ddc0a 100644
--- a/Content.Server/DeltaV/Objectives/Systems/KillFellowTraitorObjectiveSystem.cs
+++ b/Content.Server/DeltaV/Objectives/Systems/KillFellowTraitorObjectiveSystem.cs
@@ -46,16 +46,19 @@ private void OnTraitorKillAssigned(EntityUid uid, PickRandomTraitorComponent com
         // Going through each OTHER traitor
         foreach (var traitor in traitors)
         {
-            // Assume it will be a valid traitor.
-            validTraitorMinds.Add(traitor.Id);
-
+            var valid = true;
             // Going through each of OUR objectives.
             foreach (var objective in args.Mind.Objectives)
             {
-                // If one of OUR objectives already targets a traitor, remove them from the vaild list.
+                // If one of OUR objectives already targets a traitor, don't add it to the list.
                 if (TryComp<TargetObjectiveComponent>(objective, out var targetComp) && targetComp.Target == traitor.Id)
-                    validTraitorMinds.RemoveAt(validTraitorMinds.Count - 1);
+                {
+                    valid = false;
+                    break;
+                }
             }
+            if (valid)
+                validTraitorMinds.Add(traitor.Id);
         }
 
         // No other traitors