diff --git a/xkb/xkb.c b/xkb/xkb.c
index 137d70da2..f3cc05c4e 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -3949,7 +3949,8 @@ XkbSendNames(ClientPtr client, XkbDescPtr xkb, xkbGetNamesReply * rep)
             register CARD32 *atm;
 
             for (i = 0; i < rep->nTypes; i++, type++) {
-                *desc++ = type->num_levels;
+                /* Either no name or all of them, even empty ones */
+                *desc++ = (type->level_names) ? type->num_levels : 0;
             }
             desc += XkbPaddedSize(rep->nTypes) - rep->nTypes;