diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
index c63b2b06d4e..7af0f41188c 100644
--- a/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
+++ b/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
@@ -2048,7 +2048,11 @@ public class ComputerUtilCombat {
 
         // Order the combatants in preferred order in case legacy ordering is disabled
         if (!self.getGame().getRules().hasOrderCombatants()) {
-            // TODO: sometimes, orderAttackers needs to be called instead - differentiate this here somehow
+            if (combatant.isAttacking()) { 
+                opposedCombatants = AiBlockController.orderBlockers(combatant, new CardCollection(opposedCombatants));
+            } else {
+                 opposedCombatants = AiBlockController.orderAttackers(combatant, opposedCombatants);
+            }
             block = AiBlockController.orderBlockers(attacker, new CardCollection(block)); // assume sorted in case the legacy option is enabled
         }