diff --git a/nq/source/host.c b/nq/source/host.c
index 2a9e1408b..e0a3cdc02 100644
--- a/nq/source/host.c
+++ b/nq/source/host.c
@@ -983,8 +983,8 @@ Host_Init (quakeparms_t *parms)
 		CDAudio_Init ();
 		Sbar_Init ();
 		CL_Init ();
+		CL_SetState (ca_disconnected);
 	}
-	CL_SetState (ca_disconnected);
 
 	if (cl_quakerc->int_val)
 		Cbuf_InsertText ("exec quake.rc\n");
@@ -1026,12 +1026,11 @@ Host_Shutdown (void)
 
 	Host_WriteConfiguration ();
 
-	CDAudio_Shutdown ();
 	NET_Shutdown ();
-	S_Shutdown ();
-	IN_Shutdown ();
-
 	if (cls.state != ca_dedicated) {
+		CDAudio_Shutdown ();
+		S_Shutdown ();
+		IN_Shutdown ();
 		VID_Shutdown ();
 	}
 }
diff --git a/nq/source/sys_unix.c b/nq/source/sys_unix.c
index ccad9d3c1..0035bdec6 100644
--- a/nq/source/sys_unix.c
+++ b/nq/source/sys_unix.c
@@ -162,6 +162,8 @@ main (int c, const char *v[])
 
 	parms.memsize = 16 * 1024 * 1024;
 
+	isDedicated = (COM_CheckParm ("-dedicated") != 0);
+
 	j = COM_CheckParm ("-mem");
 	if (j)
 		parms.memsize = (int) (atof (com_argv[j + 1]) * 1024 * 1024);