diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index fef534fa5f2..92bf8214336 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -831,13 +831,16 @@ static void view3d_main_area_listener(bScreen *sc, ScrArea *sa, ARegion *ar, wmN
 			break;
 		case NC_LAMP:
 			switch (wmn->data) {
-				case ND_LIGHTING_DRAW:
+				case ND_LIGHTING:
 					if ((v3d->drawtype == OB_MATERIAL) ||
 					    (v3d->drawtype == OB_TEXTURE && (scene->gm.matmode == GAME_MAT_GLSL)))
 					{
 						ED_region_tag_redraw(ar);
 					}
 					break;
+				case ND_LIGHTING_DRAW:
+					ED_region_tag_redraw(ar);
+					break;
 			}
 			break;
 		case NC_IMAGE:
diff --git a/source/blender/makesrna/intern/rna_lamp.c b/source/blender/makesrna/intern/rna_lamp.c
index d733d9b4cb6..ffc9ac0e52e 100644
--- a/source/blender/makesrna/intern/rna_lamp.c
+++ b/source/blender/makesrna/intern/rna_lamp.c
@@ -136,10 +136,7 @@ static void rna_Lamp_update(Main *UNUSED(bmain), Scene *scene, PointerRNA *ptr)
 	Lamp *la = ptr->id.data;
 
 	DAG_id_tag_update(&la->id, 0);
-	if (scene->gm.matmode == GAME_MAT_GLSL)
-		WM_main_add_notifier(NC_LAMP | ND_LIGHTING_DRAW, la);
-	else
-		WM_main_add_notifier(NC_LAMP | ND_LIGHTING, la);
+	WM_main_add_notifier(NC_LAMP | ND_LIGHTING, la);
 }
 
 static void rna_Lamp_draw_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)