diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index 73e82fbf..0a60ee57 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -2794,7 +2794,7 @@ Writes key bindings and archived cvars to config file if modified
 ===============
 */
 void Com_WriteConfiguration( void ) {
-#ifndef DEDICATED
+#if !defined(DEDICATED) && !defined(STANDALONE)
 	cvar_t	*fs;
 #endif
 	// if we are quiting without fully initializing, make sure
@@ -2810,10 +2810,10 @@ void Com_WriteConfiguration( void ) {
 
 	Com_WriteConfigToFile( Q3CONFIG_CFG );
 
-	// not needed for dedicated
-#ifndef DEDICATED
+	// not needed for dedicated or standalone
+#if !defined(DEDICATED) && !defined(STANDALONE)
 	fs = Cvar_Get ("fs_game", "", CVAR_INIT|CVAR_SYSTEMINFO );
-#ifndef STANDALONE
+
 	if(!com_standalone->integer)
 	{
 		if (UI_usesUniqueCDKey() && fs && fs->string[0] != 0) {
@@ -2823,7 +2823,6 @@ void Com_WriteConfiguration( void ) {
 		}
 	}
 #endif
-#endif
 }