diff --git a/Mage.Server/src/main/java/mage/server/TableController.java b/Mage.Server/src/main/java/mage/server/TableController.java
index 62cd69820d..11968b9532 100644
--- a/Mage.Server/src/main/java/mage/server/TableController.java
+++ b/Mage.Server/src/main/java/mage/server/TableController.java
@@ -217,9 +217,18 @@ public class TableController {
 
     public synchronized boolean submitDeck(UUID userId, DeckCardLists deckList) throws MageException {
         UUID playerId = userPlayerMap.get(userId);
-        TournamentPlayer player = tournament.getPlayer(playerId);
-        if (player.hasQuit()) {
-            return true; // so the construct panel closes after submit
+        if (table.isTournament()) {
+            TournamentPlayer player = tournament.getPlayer(playerId);
+            if (player.hasQuit()) {
+                return true; // so the construct panel closes after submit
+            }
+        } else {
+            if (table.getMatch() != null) {
+                MatchPlayer mPlayer = table.getMatch().getPlayer(playerId);
+                if (mPlayer.hasQuit()) {
+                    return true; // so the construct panel closes after submit
+                }
+            }
         }
         if (table.getState() != TableState.SIDEBOARDING && table.getState() != TableState.CONSTRUCTING) {
             return false;