diff --git a/source/blender/render/intern/source/shadeinput.c b/source/blender/render/intern/source/shadeinput.c
index 69e9fa71818..a5b4a60861f 100644
--- a/source/blender/render/intern/source/shadeinput.c
+++ b/source/blender/render/intern/source/shadeinput.c
@@ -879,7 +879,10 @@ void shade_samples_do_shadow(ShadeSample *ssamp)
 				for(sample=0, shi= ssamp->shi; sample<ssamp->tot; shi++, sample++) {
 					float visifac, lv[3], lampdist, inpr;
 					
-					/* three tests to quickly reject */
+					/* tests to quickly reject */
+					if(lar->mode & LA_LAYER) if((lar->lay & shi->vlr->lay)==0) continue;
+					if((lar->lay & shi->lay)==0) continue;
+					
 					if(!(shi->mode & MA_SHADOW) || (shi->mode & MA_SHLESS))
 						continue;