diff --git a/source/core/gameconfigfile.cpp b/source/core/gameconfigfile.cpp
index 8b41105d5..f34e9076a 100644
--- a/source/core/gameconfigfile.cpp
+++ b/source/core/gameconfigfile.cpp
@@ -535,7 +535,8 @@ void G_ReadConfig(const char* game)
 	// Process automatically executed files
 	FExecList *exec;
 	FArgs *execFiles = new FArgs;
-	GameConfig->AddAutoexec(execFiles, game);
+	if (!(Args->CheckParm("-noautoexec")))
+		GameConfig->AddAutoexec(execFiles, game);
 	exec = D_MultiExec(execFiles, NULL);
 	delete execFiles;