diff --git a/src/d_main.c b/src/d_main.c
index bbb154e1f..ae706ea91 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1286,12 +1286,14 @@ void D_SRB2Main(void)
 	// Lactozilla: Does the render mode need to change?
 	if ((setrenderneeded != 0) && (setrenderneeded != rendermode))
 	{
+		CONS_Printf("Switching the renderer...\n");
 		needpatchflush = true;
 		needpatchrecache = true;
 		VID_CheckRenderer();
 		SCR_ChangeRendererCVars(setrenderneeded);
+		D_CheckRendererState();
+		setrenderneeded = 0;
 	}
-	D_CheckRendererState();
 
 	wipegamestate = gamestate;
 
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index 13e2423c4..7af1863ab 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -1499,7 +1499,6 @@ void VID_CheckRenderer(void)
 	{
 		I_StartupHardwareGraphics();
 		R_InitHardwareMode();
-		HWR_Switch();
 	}
 #endif
 }