diff --git a/libs/audio/cd.c b/libs/audio/cd.c
index 3881dd1e7..57f53537f 100644
--- a/libs/audio/cd.c
+++ b/libs/audio/cd.c
@@ -37,6 +37,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "QF/cmd.h"
 #include "QF/cvar.h"
 #include "QF/plugin.h"
+#include "QF/qargs.h"
 #include "QF/qtypes.h"
 #include "QF/sys.h"
 
@@ -96,6 +97,10 @@ CDAudio_Init (void)
 	PI_RegisterPlugins (cd_plugin_list);
 	cd_plugin = Cvar_Get ("cd_plugin", "file", CVAR_ROM, NULL,
 						  "CD Plugin to use");
+
+	if (COM_CheckParm ("-nocdaudio"))
+		return 0;
+
 	if (!*cd_plugin->string) {
 		Sys_Printf ("Not loading CD due to no driver\n");
 		return 0;
diff --git a/libs/audio/cd/cd_sgi.c b/libs/audio/cd/cd_sgi.c
index 7fd5315e6..64e681723 100644
--- a/libs/audio/cd/cd_sgi.c
+++ b/libs/audio/cd/cd_sgi.c
@@ -333,9 +333,6 @@ I_SGI_Init (void)
 {
 	int         i;
 
-	if (COM_CheckParm ("-nocdaudio"))
-		return ;
-
 	bgmvolume = Cvar_Get ("bgmvolume", "1", CVAR_ARCHIVE, NULL,
 						  "Volume of CD music");
 	if ((i = COM_CheckParm ("-cddev")) != 0 && i < com_argc - 1) {