diff --git a/server/masterserver/gsmgr.cc b/server/masterserver/gsmgr.cc
index 25b6af9..947f053 100644
--- a/server/masterserver/gsmgr.cc
+++ b/server/masterserver/gsmgr.cc
@@ -178,18 +178,18 @@ void GSMgr::RearrangeNode()
               [] (const GSNode* a, const GSNode* b)
               {
                   if (a->servicing && b->servicing) {
-                      if (a->room_num < b->room_num) {
-                          return true;
-                      }
-                      if (a->room_num > b->room_num) {
-                          return false;
-                      }
                       if (a->online_num < b->online_num) {
                           return true;
                       }
                       if (a->online_num > b->online_num) {
                           return false;
                       }
+                      if (a->room_num < b->room_num) {
+                          return true;
+                      }
+                      if (a->room_num > b->room_num) {
+                          return false;
+                      }
                       return a->node_idx > b->node_idx;
                   }
                   if (a->servicing) {