diff --git a/src/wayland/meta-wayland-tablet-pad-ring.c b/src/wayland/meta-wayland-tablet-pad-ring.c
index ee138e025..26ff55713 100644
--- a/src/wayland/meta-wayland-tablet-pad-ring.c
+++ b/src/wayland/meta-wayland-tablet-pad-ring.c
@@ -79,7 +79,8 @@ tablet_pad_ring_set_feedback (struct wl_client   *client,
 {
   MetaWaylandTabletPadRing *ring = wl_resource_get_user_data (resource);
 
-  /* FIXME: check serial */
+  if (ring->group->mode_switch_serial != serial)
+    return;
 
   ring->feedback = g_strdup (str);
 }