diff --git a/src/r_bsp.cpp b/src/r_bsp.cpp
index a16798c1f..e6a7c011a 100644
--- a/src/r_bsp.cpp
+++ b/src/r_bsp.cpp
@@ -58,10 +58,7 @@ boolean R_NoEncore(sector_t *sector, levelflat_t *flat, boolean ceiling)
 	const boolean invertEncore = (sector->flags & MSF_INVERTENCORE);
 	const terrain_t *terrain = (flat != NULL ? flat->terrain : NULL);
 
-	if ((terrain == NULL) || (terrain->flags & TRF_REMAP)
-		|| (terrain->trickPanel <= 0
-		&& terrain->speedPad <= 0
-		&& !(terrain->flags & TRF_SNEAKERPANEL)))
+	if ((terrain == NULL) || (terrain->flags & TRF_REMAP))
 	{
 		return invertEncore;
 	}