diff --git a/source/blender/renderconverter/intern/convertBlenderScene.c b/source/blender/renderconverter/intern/convertBlenderScene.c
index b6fb272036e..9fdbfd5a7bb 100644
--- a/source/blender/renderconverter/intern/convertBlenderScene.c
+++ b/source/blender/renderconverter/intern/convertBlenderScene.c
@@ -1560,6 +1560,11 @@ void RE_add_render_lamp(Object *ob, int actual_render)
 	}
 	
 	la= ob->data;
+	/* prevent only shadow from rendering light */
+	if(la->mode & LA_ONLYSHADOW)
+		if((R.r.mode & R_SHADOW)==0)
+			return;
+
 	lar= (LampRen *)MEM_callocN(sizeof(LampRen),"lampren");
 	R.la[R.totlamp++]= lar;