diff --git a/code/client/cl_main.c b/code/client/cl_main.c
index 21a56f64..2d3a2d41 100644
--- a/code/client/cl_main.c
+++ b/code/client/cl_main.c
@@ -1526,10 +1526,6 @@ void CL_Connect_f( void ) {
 	CL_Disconnect( qtrue );
 	Con_Close();
 
-	/* MrE: 2000-09-13: now called in CL_DownloadsComplete
-	CL_FlushMemory( );
-	*/
-
 	Q_strncpyz( cls.servername, server, sizeof(cls.servername) );
 
 	if (!NET_StringToAdr(cls.servername, &clc.serverAddress, family) ) {
@@ -2755,6 +2751,10 @@ void CL_StartHunkUsers( qboolean rendererOnly ) {
 		S_BeginRegistration();
 	}
 
+	if( com_dedicated->integer ) {
+		return;
+	}
+
 	if ( !cls.uiStarted ) {
 		cls.uiStarted = qtrue;
 		CL_InitUI();