diff --git a/src/game.cpp b/src/game.cpp
index c01b738d45d..813773ea050 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -2382,9 +2382,7 @@ static int do_gameloop(int argc, char** argv)
 				continue;
 			}
 		} else if(res == gui2::ttitle_screen::MULTIPLAYER) {
-			if (!game_config::mp_debug) {
-				game_config::debug = false;
-			}
+			game_config::debug = false;
 			if(game.play_multiplayer() == false) {
 				continue;
 			}
diff --git a/src/menu_events.cpp b/src/menu_events.cpp
index 2f06becf74d..55b67f39de4 100644
--- a/src/menu_events.cpp
+++ b/src/menu_events.cpp
@@ -3356,7 +3356,7 @@ void console_handler::do_turn_limit()
 }
 
 void console_handler::do_debug() {
-	if (network::nconnections() == 0) {
+	if (network::nconnections() == 0 || game_config::mp_debug) {
 		print(get_cmd(), _("Debug mode activated!"));
 		game_config::debug = true;
 	} else {
diff --git a/src/multiplayer_lobby.cpp b/src/multiplayer_lobby.cpp
index fe698293090..d2841246d77 100644
--- a/src/multiplayer_lobby.cpp
+++ b/src/multiplayer_lobby.cpp
@@ -770,7 +770,6 @@ lobby::lobby(game_display& disp, const config& cfg, chat& c, config& gamelist) :
 	filter_text_.set_help_string(_("Only show games whose title or description contain the entered text"));
 #endif
 
-	game_config::debug = false;
 	gamelist_updated();
 	sound::play_music_repeatedly(game_config::lobby_music);
 }