diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 961c1e5944ef2b7672e94e64123c383bd761d5de..7516df2e0c3438b273a2834ebbdfb6723a57b49f 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -2211,8 +2211,10 @@ static void CL_ConnectToServer(boolean viams)
 	}
 	while (!(cl_mode == CL_CONNECTED && (client || (server && nodewaited <= pnumnodes))));
 
+#ifndef NONET
 	if (netgame)
 		F_StartWaitingPlayers();
+#endif
 	DEBFILE(va("Synchronisation Finished\n"));
 
 	displayplayer = consoleplayer;
diff --git a/src/m_menu.c b/src/m_menu.c
index 77bfb2c4ccae3c8c8a0ef860afe6a54bbe931480..615b8c893223ad7009832eb55ef31f2f5589ca8a 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -1830,7 +1830,6 @@ static menu_t SP_NightsGhostDef =
 	NULL
 };*/
 
-#ifndef NONET
 // Multiplayer
 menu_t MP_MainDef =
 {
@@ -1841,12 +1840,18 @@ menu_t MP_MainDef =
 	M_DrawMPMainMenu,
 	42, 30,
 	0,
+#ifndef NONET
 	M_CancelConnect
-};
-menu_t MP_ServerDef = MAPICONMENUSTYLE("M_MULTI", MP_ServerMenu, &MP_MainDef);
+#else
+	NULL
 #endif
+};
+
 menu_t MP_OfflineServerDef = MAPICONMENUSTYLE("M_MULTI", MP_OfflineServerMenu, &MP_MainDef);
+
 #ifndef NONET
+menu_t MP_ServerDef = MAPICONMENUSTYLE("M_MULTI", MP_ServerMenu, &MP_MainDef);
+
 menu_t MP_ConnectDef =
 {
 	"M_MULTI",