diff --git a/src/d_main.cpp b/src/d_main.cpp
index 4f0916a728..0f3d122f46 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -3207,7 +3207,8 @@ static int D_DoomMain_Internal (void)
 		// Process automatically executed files
 		FExecList *exec;
 		FArgs *execFiles = new FArgs;
-		GameConfig->AddAutoexec(execFiles, gameinfo.ConfigName);
+		if (!(Args->CheckParm("-noautoexec")))
+			GameConfig->AddAutoexec(execFiles, gameinfo.ConfigName);
 		exec = D_MultiExec(execFiles, NULL);
 		delete execFiles;