diff --git a/src/guiengine/engine.cpp b/src/guiengine/engine.cpp
index 5c271e8b8..5e3ffacbf 100644
--- a/src/guiengine/engine.cpp
+++ b/src/guiengine/engine.cpp
@@ -1425,9 +1425,12 @@ namespace GUIEngine
         // This will avoid no response in windows, also allow showing loading
         // icon in apple device, because apple device only update render
         // buffer if you poll the mainloop
-        g_device->setEventReceiver(NULL);
-        g_device->run();
-        g_device->setEventReceiver(EventHandler::get());
+        if (!ProfileWorld::isNoGraphics())
+        {
+            g_device->setEventReceiver(NULL);
+            g_device->run();
+            g_device->setEventReceiver(EventHandler::get());
+        }
 
         // If launch is finished, pause & display the story mode timers
         if ( !launching)
diff --git a/src/main_loop.cpp b/src/main_loop.cpp
index 1d5f662e2..f9f66cf83 100644
--- a/src/main_loop.cpp
+++ b/src/main_loop.cpp
@@ -641,8 +641,9 @@ void MainLoop::renderGUI(int phase, int loop_index, int loop_size)
 #ifdef SERVER_ONLY
     return;
 #else
-    if (NetworkConfig::get()->isNetworking() &&
-        NetworkConfig::get()->isServer()         )
+    if ((NetworkConfig::get()->isNetworking() &&
+        NetworkConfig::get()->isServer()) ||
+        ProfileWorld::isNoGraphics())
     {
         return;
     }