diff --git a/ElectronicObserver/Window/Dialog/QuestTrackerManager/ViewModels/Conditions/ShipTypeConditionViewModel.cs b/ElectronicObserver/Window/Dialog/QuestTrackerManager/ViewModels/Conditions/ShipTypeConditionViewModel.cs
index 991782e7a..3edd89abe 100644
--- a/ElectronicObserver/Window/Dialog/QuestTrackerManager/ViewModels/Conditions/ShipTypeConditionViewModel.cs
+++ b/ElectronicObserver/Window/Dialog/QuestTrackerManager/ViewModels/Conditions/ShipTypeConditionViewModel.cs
@@ -89,7 +89,11 @@ public bool ConditionMet(IFleetData fleet)
 		bool flagshipCondition = !Model.MustBeFlagship ||
 			Model.Types.Contains(ships[0].MasterShip.ShipType);
 
-		int shipCount = ships.Count(s => Model.Types.Contains(s.MasterShip.ShipType));
+		int shipCount = Model.Types.Contains(ShipTypes.All) switch
+		{
+			true => ships.Count,
+			_ => ships.Count(s => Model.Types.Contains(s.MasterShip.ShipType)),
+		};
 
 		bool countCondition = Compare(shipCount, Model.Count, Model.ComparisonType);