diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/HumanAIController.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/HumanAIController.cs
index 7b61861e2..e1587cdfc 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/AI/HumanAIController.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/HumanAIController.cs
@@ -321,11 +321,13 @@ namespace Barotrauma
                         if (c.CurrentHull != hull) { continue; }
                         if (AIObjectiveRescueAll.IsValidTarget(c, Character))
                         {
-                            AddTargets<AIObjectiveRescueAll, Character>(c, Character);
-                            if (newOrder == null)
+                            if (AddTargets<AIObjectiveRescueAll, Character>(c, Character))
                             {
-                                var orderPrefab = Order.PrefabList.Find(o => o.AITag == "requestfirstaid");
-                                newOrder = new Order(orderPrefab, c.CurrentHull, null, orderGiver: Character);
+                                if (newOrder == null)
+                                {
+                                    var orderPrefab = Order.PrefabList.Find(o => o.AITag == "requestfirstaid");
+                                    newOrder = new Order(orderPrefab, c.CurrentHull, null, orderGiver: Character);
+                                }
                             }
                         }
                     }
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveLoop.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveLoop.cs
index 1d0816dca..82a276ec0 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveLoop.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveLoop.cs
@@ -21,6 +21,7 @@ namespace Barotrauma
 
         public bool AddTarget(T target)
         {
+            if (character.IsDead) { return false; }
             if (ReportedTargets.Contains(target))
             {
                 return false;