diff --git a/Mage.Sets/src/mage/sets/fifthedition/Stasis.java b/Mage.Sets/src/mage/sets/fifthedition/Stasis.java
index cfba746959..330a0a2942 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Stasis.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Stasis.java
@@ -39,6 +39,7 @@ import mage.abilities.effects.common.SacrificeSourceUnlessPaysEffect;
 import mage.cards.CardImpl;
 import mage.game.Game;
 import mage.game.events.GameEvent;
+import mage.players.Player;
 
 /**
  *
@@ -96,11 +97,14 @@ class SkipUntapStepEffect extends ReplacementEffectImpl {
         return true;
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.UNTAP_STEP;
+    }
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (event.getType() == GameEvent.EventType.UNTAP) {
-            return true;
-        }
-        return false;
+        Player controller = game.getPlayer(source.getControllerId());
+        return controller != null && controller.getInRange().contains(event.getPlayerId());
     }
 }
\ No newline at end of file