diff --git a/src/guiengine/screen.cpp b/src/guiengine/screen.cpp
index 0f64a42cf..6523f4103 100644
--- a/src/guiengine/screen.cpp
+++ b/src/guiengine/screen.cpp
@@ -100,7 +100,9 @@ void Screen::init()
  */
 void Screen::push()
 {
+#ifndef SERVER_ONLY
     StateManager::get()->pushScreen(this);
+#endif
 }   // push
 
 // -----------------------------------------------------------------------------
diff --git a/src/states_screens/state_manager.cpp b/src/states_screens/state_manager.cpp
index db58c644b..86226f661 100644
--- a/src/states_screens/state_manager.cpp
+++ b/src/states_screens/state_manager.cpp
@@ -152,8 +152,12 @@ void StateManager::resetActivePlayers()
 
 bool StateManager::throttleFPS()
 {
+#ifndef SERVER_ONLY
     return m_game_mode != GUIEngine::GAME  &&
            GUIEngine::getCurrentScreen()->throttleFPS();
+#else
+    return true;
+#endif
 }   // throttleFPS
 
 // ----------------------------------------------------------------------------