diff --git a/server/masterserver/app.cc b/server/masterserver/app.cc
index 74de620..f440b5b 100755
--- a/server/masterserver/app.cc
+++ b/server/masterserver/app.cc
@@ -109,5 +109,11 @@ void App::DispatchSocketMsg(f8::MsgHdr* hdr)
 
 int App::GetGameId() const
 {
+#ifdef DEBUG
+    std::string game_id = a8::XValue(getenv("_")).GetString();
+    a8::ReplaceString(game_id, "./masterserver", "");
+    return a8::XValue(game_id);
+#else
     return GAME_ID;
+#endif
 }