diff --git a/src/d_main.cpp b/src/d_main.cpp
index e165bb93e..60f26ba66 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -3331,7 +3331,7 @@ static int D_InitGame(const FIWADInfo* iwad_info, std::vector<std::string>& allw
 	allwads.shrink_to_fit();
 	SetMapxxFlag();
 
-	if (!restart)
+	if (!(restart || norun))
 	{
 		// Note: this has to happen after the file system has been initialized (backends may load shaders during initialization)
 		V_Init2();
@@ -3372,9 +3372,6 @@ static int D_InitGame(const FIWADInfo* iwad_info, std::vector<std::string>& allw
 		exec = NULL;
 	}
 
-	if (!(restart || norun))
-		V_Init2();
-
 	// [RH] Initialize localizable strings. 
 	GStrings.LoadStrings(fileSystem, language);