diff --git a/xkb/xkb.c b/xkb/xkb.c
index 8a0abfc18..642051020 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -3121,7 +3121,7 @@ ProcXkbSetNamedIndicator(ClientPtr client)
 	if (!stuff->createMap)
 	    return client->noClientException;
 	for (led=0,map=NULL;(led<XkbNumIndicators)&&(map==NULL);led++) {
-	    if ((sli->names)&&(sli->leds)&&(sli->names[led]==None)&&
+	    if ((sli->names)&&(sli->maps)&&(sli->names[led]==None)&&
                 (!XkbIM_InUse(&sli->maps[led]))) {
 		map= &sli->maps[led];
 		sli->names[led]= stuff->indicator;