diff --git a/Mage/src/mage/game/Table.java b/Mage/src/mage/game/Table.java
index fb8b5e9984d..b148c5094ab 100644
--- a/Mage/src/mage/game/Table.java
+++ b/Mage/src/mage/game/Table.java
@@ -186,13 +186,9 @@ public class Table implements Serializable {
         for (int i = 0; i < numSeats; i++ ) {
             Player player = seats[i].getPlayer();
             if (player != null && player.getId().equals(playerId)) {
-                if (match != null) {
-                    match.leave(playerId);
-                } else {
-                    seats[i].setPlayer(null);
-                    if (state == TableState.STARTING) {
-                        state = TableState.WAITING;
-                    }
+                seats[i].setPlayer(null);
+                if (state == TableState.STARTING) {
+                    state = TableState.WAITING;
                 }
                 break;
             }
diff --git a/Mage/src/mage/game/match/MatchImpl.java b/Mage/src/mage/game/match/MatchImpl.java
index fce78e348b6..2d813ce6e32 100644
--- a/Mage/src/mage/game/match/MatchImpl.java
+++ b/Mage/src/mage/game/match/MatchImpl.java
@@ -90,6 +90,9 @@ public abstract class MatchImpl implements Match {
     public boolean leave(UUID playerId) {
         MatchPlayer mPlayer = getPlayer(playerId);
         if (mPlayer != null) {
+            if (games.isEmpty() ) {
+                return players.remove(mPlayer);
+            }
             mPlayer.setQuit(true);
             synchronized (this) {
                 this.notifyAll();