diff --git a/src/st_stuff.c b/src/st_stuff.c
index be5e3cc97..4de0c612d 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -137,7 +137,7 @@ void ST_doPaletteStuff(void)
 	{
 		st_palette = palette;
 
-		if (rendermode != render_none)
+		if (rendermode == render_soft)
 		{
 			//V_SetPaletteLump(GetPalette()); // Reset the palette -- is this needed?
 			if (!r_splitscreen)
@@ -222,7 +222,10 @@ static inline void ST_Stop(void)
 	if (st_stopped)
 		return;
 
-	V_SetPalette(0);
+#ifdef HWRENDER
+	if (rendermode != render_opengl)
+#endif
+		V_SetPalette(0);
 
 	st_stopped = true;
 }