diff --git a/xkb/xkb.c b/xkb/xkb.c
index 56be6e2ab6..754641b154 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -3356,6 +3356,11 @@ _XkbSetNamedIndicator(ClientPtr client, DeviceIntPtr dev,
     if (rc != Success || !map) /* oh-oh */
         return rc;
 
+    sli = XkbFindSrvLedInfo(dev, stuff->ledClass, stuff->ledID,
+                            XkbXI_IndicatorsMask);
+    if (!sli)
+        return BadAlloc;
+
     namec = mapc = statec = 0;
     extDevReason = 0;