diff --git a/Mage/src/mage/players/PlayerImpl.java b/Mage/src/mage/players/PlayerImpl.java
index 8ab8b836b3c..44d164941fb 100644
--- a/Mage/src/mage/players/PlayerImpl.java
+++ b/Mage/src/mage/players/PlayerImpl.java
@@ -1136,7 +1136,9 @@ public abstract class PlayerImpl implements Player, Serializable {
         justActivatedType = null;
         if (result) {
             if (isHuman() && (ability.getAbilityType().equals(AbilityType.SPELL) || ability.getAbilityType().equals(AbilityType.ACTIVATED))) {
-                setJustActivatedType(ability.getAbilityType());
+                if (ability.isUsesStack()) { // if the ability does not use the stack (e.g. Suspend) auto pass would go to next phase unintended
+                    setJustActivatedType(ability.getAbilityType());
+                }
             }
             game.getPlayers().resetPassed();
         }