diff --git a/src/main/java/forge/card/cost/CostSacrifice.java b/src/main/java/forge/card/cost/CostSacrifice.java
index d3df4a05ba9..1cf0433ba17 100644
--- a/src/main/java/forge/card/cost/CostSacrifice.java
+++ b/src/main/java/forge/card/cost/CostSacrifice.java
@@ -199,11 +199,11 @@ public class CostSacrifice extends CostPartWithList {
         if (this.isTargetingThis()) {
             this.getList().add(source);
         } else if (this.getAmount().equals("All")) {
-            List<Card> typeList = new ArrayList<Card>(activator.getCardsIn(ZoneType.Battlefield));
+            /*List<Card> typeList = new ArrayList<Card>(activator.getCardsIn(ZoneType.Battlefield));
             typeList = CardLists.getValidCards(typeList, this.getType().split(";"), activator, source);
             if (activator.hasKeyword("You can't sacrifice creatures to cast spells or activate abilities.")) {
                 typeList = CardLists.getNotType(typeList, "Creature");
-            }
+            }*/
             // Does the AI want to use Sacrifice All?
             return false;
         } else {
diff --git a/src/main/java/forge/game/ai/ComputerUtil.java b/src/main/java/forge/game/ai/ComputerUtil.java
index 29615335ffe..b9227e63be3 100644
--- a/src/main/java/forge/game/ai/ComputerUtil.java
+++ b/src/main/java/forge/game/ai/ComputerUtil.java
@@ -431,15 +431,9 @@ public class ComputerUtil {
                 typeList.remove(prefCard);
                 count++;
             } else {
-                break;
+                return null;
             }
         }
-
-        CardLists.sortByPowerAsc(typeList);
-
-        for (int i = count; i < amount; i++) {
-            sacList.add(typeList.get(i));
-        }
         return sacList;
     }