diff --git a/src/main/java/forge/card/abilityfactory/ai/AttachAi.java b/src/main/java/forge/card/abilityfactory/ai/AttachAi.java
index 87083ec9c3b..5b28573467d 100644
--- a/src/main/java/forge/card/abilityfactory/ai/AttachAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/AttachAi.java
@@ -394,8 +394,17 @@ public class AttachAi extends SpellAiLogic {
             if (!aiStuffies.isEmpty()) {
                 chosen = aiStuffies.get(0);
             } else {
-                // Improve this to include all Opponent creatures
-                final List<Card> creatures = CardLists.filterControlledBy(list, ai.getOpponents());
+                List<Card> creatures = CardLists.filterControlledBy(list, ai.getOpponents());
+                creatures = CardLists.filter(creatures, new Predicate<Card>() {
+                    @Override
+                    public boolean apply(final Card c) {
+                        // Don't enchant creatures that can survive
+                        if (c.hasKeyword("Indestructible") || c.getNetCombatDamage() < c.getNetDefense()) {
+                            return false;
+                        }
+                        return true;
+                    }
+                });
                 chosen = CardFactoryUtil.getBestCreatureAI(creatures);
             }
         }