diff --git a/source/glest_game/graphics/renderer.cpp b/source/glest_game/graphics/renderer.cpp
index 4f2fa360..1e0acb4f 100644
--- a/source/glest_game/graphics/renderer.cpp
+++ b/source/glest_game/graphics/renderer.cpp
@@ -154,6 +154,7 @@ const int OBJECT_SELECT_OFFSET=100000000;
 Renderer::Renderer(bool masterserverMode) : BaseRenderer() {
 	this->masterserverMode = masterserverMode;
 	//printf("this->masterserverMode = %d\n",this->masterserverMode);
+	//assert(0==1);
 
 	Renderer::rendererEnded = false;
 	this->allowRenderUnitTitles = false;
diff --git a/source/glest_game/main/main.cpp b/source/glest_game/main/main.cpp
index 5242457f..19fe7f08 100644
--- a/source/glest_game/main/main.cpp
+++ b/source/glest_game/main/main.cpp
@@ -2815,6 +2815,10 @@ int glestMain(int argc, char** argv) {
         	if(SystemFlags::VERBOSE_MODE_ENABLED) printf("**ENABLED OPENGL VSYNCH**\n");
         }
 
+		if(hasCommandArgument(argc, argv,string(GAME_ARGS[GAME_ARG_MASTERSERVER_MODE])) == true) {
+			Renderer &renderer= Renderer::getInstance(true);
+		}
+
 		//float pingTime = Socket::getAveragePingMS("soft-haus.com");
 		//printf("Ping time = %f\n",pingTime);
 
@@ -3080,7 +3084,6 @@ int glestMain(int argc, char** argv) {
 			program->initServer(mainWindow,false,true);
 		}
 		else if(hasCommandArgument(argc, argv,string(GAME_ARGS[GAME_ARG_MASTERSERVER_MODE])) == true) {
-			Renderer &renderer= Renderer::getInstance(true);
 			program->initServer(mainWindow,false,true,true);
 		}
 		else if(hasCommandArgument(argc, argv,string(GAME_ARGS[GAME_ARG_AUTOSTART_LASTGAME])) == true) {