diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java
index 9323bb230f0..c9165fc2358 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java
@@ -481,7 +481,8 @@ public class AbilityFactoryZoneAffecting {
             }
 
             if (((computerHandSize + numCards) > computerMaxHandSize)
-                    && Singletons.getModel().getGameState().getPhaseHandler().getPlayerTurn().isComputer()) {
+                    && Singletons.getModel().getGameState().getPhaseHandler().getPlayerTurn().isComputer()
+                    && !sa.isTrigger()) {
                 // Don't draw too many cards and then risk discarding cards at
                 // EOT
                 if (!(params.containsKey("NextUpkeep") || (sa instanceof AbilitySub)) && !mandatory) {