diff --git a/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java b/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
index 05d34df98e6..d0406edaa13 100644
--- a/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
@@ -945,7 +945,10 @@ public class ChangeZoneAi extends SpellAbilityAi {
 
         // Only care about combatants during combat
         if (game.getPhaseHandler().inCombat() && origin.equals(ZoneType.Battlefield)) {
-            list = CardLists.getValidCards(list, "Card.attacking,Card.blocking", null, null);
+        	CardCollection newList = CardLists.getValidCards(list, "Card.attacking,Card.blocking", null, null);
+        	if (!newList.isEmpty() || !sa.isTrigger()) {
+        		list = newList;
+        	}
         }
 
         if (list.isEmpty()) {