diff --git a/src/r_segs.c b/src/r_segs.c
index d8d9adfd5..111fb94a2 100644
--- a/src/r_segs.c
+++ b/src/r_segs.c
@@ -286,7 +286,7 @@ void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2)
 
 			if (rlight->extra_colormap && (rlight->extra_colormap->flags & CMF_FOG))
 				;
-			else if (P_ApplyLightOffset(lightnum))
+			else if (P_ApplyLightOffset(lightnum << LIGHTSEGSHIFT))
 				lightnum += curline->lightOffset;
 
 			rlight->lightnum = lightnum;
@@ -303,7 +303,7 @@ void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2)
 		if ((R_CheckColumnFunc(COLDRAWFUNC_FOG) == true)
 			|| (frontsector->extra_colormap && (frontsector->extra_colormap->flags & CMF_FOG)))
 			;
-		else if (P_ApplyLightOffset(lightnum))
+		else if (P_ApplyLightOffset(lightnum << LIGHTSEGSHIFT))
 			lightnum += curline->lightOffset;
 
 		if (lightnum < 0)
@@ -770,7 +770,7 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
 
 			if (pfloor->flags & FF_FOG || rlight->flags & FF_FOG || (rlight->extra_colormap && (rlight->extra_colormap->flags & CMF_FOG)))
 				;
-			else if (P_ApplyLightOffset(rlight->lightnum))
+			else if (P_ApplyLightOffset(rlight->lightnum << LIGHTSEGSHIFT))
 				rlight->lightnum += curline->lightOffset;
 
 			p++;
@@ -793,7 +793,7 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
 
 		if (pfloor->flags & FF_FOG || (frontsector->extra_colormap && (frontsector->extra_colormap->flags & CMF_FOG)))
 			;
-		else if (P_ApplyLightOffset(lightnum))
+		else if (P_ApplyLightOffset(lightnum << LIGHTSEGSHIFT))
 			lightnum += curline->lightOffset;
 
 		if (lightnum < 0)
@@ -1383,7 +1383,7 @@ static void R_RenderSegLoop (void)
 
 				if (dc_lightlist[i].extra_colormap)
 					;
-				else if (P_ApplyLightOffset(lightnum))
+				else if (P_ApplyLightOffset(lightnum << LIGHTSEGSHIFT))
 					lightnum += curline->lightOffset;
 
 				if (lightnum < 0)
@@ -2436,7 +2436,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 		// OPTIMIZE: get rid of LIGHTSEGSHIFT globally
 		lightnum = (frontsector->lightlevel >> LIGHTSEGSHIFT);
 
-		if (P_ApplyLightOffset(lightnum))
+		if (P_ApplyLightOffset(lightnum << LIGHTSEGSHIFT))
 			lightnum += curline->lightOffset;
 
 		if (lightnum < 0)