diff --git a/server/masterserver/gsmgr.cc b/server/masterserver/gsmgr.cc
index 3fddcbb..2df110d 100644
--- a/server/masterserver/gsmgr.cc
+++ b/server/masterserver/gsmgr.cc
@@ -4,6 +4,7 @@
 #include <a8/timer.h>
 
 #include "gsmgr.h"
+#include "app.h"
 #include "GGListener.h"
 
 void GSMgr::Init()
@@ -70,6 +71,7 @@ void GSMgr::___GSReport(f8::JsonHttpRequest* request)
         GSNode gs;
         gs.key = key;
         gs.node_id = node_id;
+        gs.node_idx = App::Instance()->NewUuid();
         gs.instance_id = instance_id;
         gs.online_num = online_num;
         gs.room_num = room_num;
diff --git a/server/masterserver/gsmgr.h b/server/masterserver/gsmgr.h
index 2909a32..6b988f1 100644
--- a/server/masterserver/gsmgr.h
+++ b/server/masterserver/gsmgr.h
@@ -5,7 +5,7 @@
 struct GSNode
 {
     std::string key;
-    unsigned short node_idx = 0;
+    long long node_idx = 0;
     int node_id = 0;
     int instance_id = 0;
     int room_num = 0;