diff --git a/src/wayland/meta-wayland-keyboard.c b/src/wayland/meta-wayland-keyboard.c
index f8042dc65..a6c861906 100644
--- a/src/wayland/meta-wayland-keyboard.c
+++ b/src/wayland/meta-wayland-keyboard.c
@@ -478,23 +478,24 @@ static void
 meta_wayland_keyboard_update_xkb_state (MetaWaylandKeyboard *keyboard)
 {
   MetaWaylandXkbInfo *xkb_info = &keyboard->xkb_info;
-  xkb_mod_mask_t latched, locked, group;
+  xkb_mod_mask_t latched, locked;
 
   /* Preserve latched/locked modifiers state */
   if (xkb_info->state)
     {
       latched = xkb_state_serialize_mods (xkb_info->state, XKB_STATE_MODS_LATCHED);
       locked = xkb_state_serialize_mods (xkb_info->state, XKB_STATE_MODS_LOCKED);
-      group = xkb_state_serialize_layout (xkb_info->state, XKB_STATE_LAYOUT_EFFECTIVE);
       xkb_state_unref (xkb_info->state);
     }
   else
-    latched = locked = group = 0;
+    {
+      latched = locked = 0;
+    }
 
   xkb_info->state = xkb_state_new (xkb_info->keymap);
 
-  if (latched || locked || group)
-    xkb_state_update_mask (xkb_info->state, 0, latched, locked, 0, 0, group);
+  if (latched || locked)
+    xkb_state_update_mask (xkb_info->state, 0, latched, locked, 0, 0, 0);
 }
 
 static void