diff --git a/src/wayland/meta-wayland-keyboard.c b/src/wayland/meta-wayland-keyboard.c
index 8626722dc..4ee7fcd90 100644
--- a/src/wayland/meta-wayland-keyboard.c
+++ b/src/wayland/meta-wayland-keyboard.c
@@ -549,7 +549,7 @@ meta_wayland_keyboard_create_new_resource (MetaWaylandKeyboard *keyboard,
 
   cr = wl_resource_create (client, &wl_keyboard_interface,
 			   MIN (META_WL_KEYBOARD_VERSION, wl_resource_get_version (seat_resource)), id);
-  wl_resource_set_implementation (cr, NULL, keyboard, unbind_resource);
+  wl_resource_set_implementation (cr, &keyboard_interface, keyboard, unbind_resource);
   wl_list_insert (&keyboard->resource_list, wl_resource_get_link (cr));
 
   wl_keyboard_send_keymap (cr,