diff --git a/forge-gui-mobile/src/forge/screens/match/MatchController.java b/forge-gui-mobile/src/forge/screens/match/MatchController.java
index 9a8641f7898..83b0844d6ae 100644
--- a/forge-gui-mobile/src/forge/screens/match/MatchController.java
+++ b/forge-gui-mobile/src/forge/screens/match/MatchController.java
@@ -209,10 +209,27 @@ public class MatchController extends AbstractGuiGame {
     public void alertUser() {
         //TODO
     }
-
+    private PlayerView lastPlayer;
     @Override
     public void updatePhase(boolean saveState) {
         final PhaseType ph = getGameView().getPhase();
+        if (ph != null) {
+            if (ph.isBefore(PhaseType.END_OF_TURN))
+                lastPlayer = getGameView().getPlayerTurn();
+            //reset phase labels
+            view.resetAllPhaseButtons();
+            if (lastPlayer != null && PhaseType.CLEANUP.equals(ph)) {
+                //set phaselabel
+                final VPhaseIndicator.PhaseLabel phaseLabel = view.getPlayerPanel(lastPlayer).getPhaseIndicator().getLabel(ph);
+                if (phaseLabel != null)
+                    phaseLabel.setActive(true);
+            } else if (getGameView().getPlayerTurn() != null) {
+                //set phaselabel
+                final VPhaseIndicator.PhaseLabel phaseLabel = view.getPlayerPanel(getGameView().getPlayerTurn()).getPhaseIndicator().getLabel(ph);
+                if (phaseLabel != null)
+                    phaseLabel.setActive(true);
+            }
+        }
 
         if(GuiBase.isNetworkplay())
             checkStack();
diff --git a/forge-gui-mobile/src/forge/screens/match/MatchScreen.java b/forge-gui-mobile/src/forge/screens/match/MatchScreen.java
index 6b7b0560e45..f656d36c504 100644
--- a/forge-gui-mobile/src/forge/screens/match/MatchScreen.java
+++ b/forge-gui-mobile/src/forge/screens/match/MatchScreen.java
@@ -349,32 +349,6 @@ public class MatchScreen extends FScreen {
         return new Rectangle(0, VPrompt.HEIGHT, scroller.getWidth(), getHeight() - 2 * VPrompt.HEIGHT);
     }
 
-    private PlayerView lastPlayer;
-    @Override
-    public void draw(Graphics g) {
-        super.draw(g);
-        final GameView game = MatchController.instance.getGameView();
-        if (game == null) { return; }
-        if (game.getPhase() != null) {
-            final PhaseType ph = game.getPhase();
-            if (ph.isBefore(PhaseType.END_OF_TURN))
-                lastPlayer = game.getPlayerTurn();
-            //reset phase labels
-            resetAllPhaseButtons();
-            if (lastPlayer != null && PhaseType.CLEANUP.equals(ph)) {
-                //set phaselabel
-                final PhaseLabel phaseLabel = getPlayerPanel(lastPlayer).getPhaseIndicator().getLabel(ph);
-                if (phaseLabel != null)
-                    phaseLabel.setActive(true);
-            } else if (game.getPlayerTurn() != null) {
-                //set phaselabel
-                final PhaseLabel phaseLabel = getPlayerPanel(game.getPlayerTurn()).getPhaseIndicator().getLabel(ph);
-                if (phaseLabel != null)
-                    phaseLabel.setActive(true);
-            }
-        }
-    }
-
     @Override
     protected void drawOverlay(Graphics g) {
         final GameView game = MatchController.instance.getGameView();