diff --git a/src/hardware/hw_cache.c b/src/hardware/hw_cache.c
index 6f375bdab..c47833187 100644
--- a/src/hardware/hw_cache.c
+++ b/src/hardware/hw_cache.c
@@ -888,10 +888,6 @@ GLTexture_t *HWR_GetTexture(INT32 tex)
 		I_Error("HWR_GetTexture: tex >= numtextures\n");
 #endif
 
-	// Lactozilla: Renderer switching
-	if (needpatchrecache && (!gr_textures))
-		HWR_LoadTextures(gr_numtextures);
-
 	// Every texture in memory, stored in the
 	// hardware renderer's bit depth format. Wow!
 	grtex = &gr_textures[tex];
diff --git a/src/r_main.c b/src/r_main.c
index 713480397..38777a521 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -1162,11 +1162,9 @@ void R_InitHardwareMode(void)
 {
 	HWR_AddSessionCommands();
 	HWR_Switch();
+	HWR_LoadTextures(numtextures);
 	if (gamestate == GS_LEVEL || (gamestate == GS_TITLESCREEN && titlemapinaction))
-	{
 		HWR_SetupLevel();
-		HWR_LoadTextures(numtextures);
-	}
 }
 #endif