diff --git a/src/p_setup.c b/src/p_setup.c
index 6a57ade6f..0a1fcb483 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -8905,6 +8905,9 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
 	// Free GPU textures before freeing patches.
 	if (rendermode == render_opengl && (vid.glstate == VID_GL_LIBRARY_LOADED))
 		HWR_ClearAllTextures();
+
+	// Delete light table textures
+	HWR_ClearLightTables();
 #endif
 
 	G_FreeGhosts(); // ghosts are allocated with PU_LEVEL
diff --git a/src/r_data.c b/src/r_data.c
index 247cea619..8fc6ed333 100644
--- a/src/r_data.c
+++ b/src/r_data.c
@@ -374,9 +374,6 @@ void R_ClearColormaps(void)
 {
 	// Purged by PU_LEVEL, just overwrite the pointer
 	extra_colormaps = R_CreateDefaultColormap(true);
-#ifdef HWRENDER
-	HWR_ClearLightTables();
-#endif
 }
 
 //