diff --git a/Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java b/Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java
index bada3674ce4..5ce4d40e853 100644
--- a/Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java
+++ b/Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java
@@ -228,6 +228,10 @@ class TableListSorter implements Comparator<Table> {
             if (one.getState().compareTo(two.getState()) != 0 ) {
                 return one.getState().compareTo(two.getState());
             }
+        } else if (!two.getState().equals(TableState.SIDEBOARDING) && !two.getState().equals(TableState.DUELING)) {
+            if (one.getState().compareTo(two.getState()) != 0 ) {
+                return one.getState().compareTo(two.getState());
+            }
         }
         if (two.getEndTime() != null) {
             if (one.getEndTime() == null) {