diff --git a/include/wlr/types/wlr_keyboard.h b/include/wlr/types/wlr_keyboard.h
index b3be053a..063d6e3f 100644
--- a/include/wlr/types/wlr_keyboard.h
+++ b/include/wlr/types/wlr_keyboard.h
@@ -89,7 +89,6 @@ struct wlr_keyboard {
 		struct wl_signal modifiers;
 		struct wl_signal keymap;
 		struct wl_signal repeat_info;
-		struct wl_signal destroy;
 	} events;
 
 	void *data;
diff --git a/types/wlr_input_method_v2.c b/types/wlr_input_method_v2.c
index 559927eb..fe156869 100644
--- a/types/wlr_input_method_v2.c
+++ b/types/wlr_input_method_v2.c
@@ -410,7 +410,7 @@ void wlr_input_method_keyboard_grab_v2_set_keyboard(
 			&keyboard_grab->keyboard_repeat_info);
 		keyboard_grab->keyboard_destroy.notify =
 			handle_keyboard_destroy;
-		wl_signal_add(&keyboard->events.destroy,
+		wl_signal_add(&keyboard->base.events.destroy,
 			&keyboard_grab->keyboard_destroy);
 
 		wlr_input_method_keyboard_grab_v2_send_modifiers(keyboard_grab,
diff --git a/types/wlr_keyboard.c b/types/wlr_keyboard.c
index 1d609094..52d9a06d 100644
--- a/types/wlr_keyboard.c
+++ b/types/wlr_keyboard.c
@@ -124,7 +124,6 @@ void wlr_keyboard_init(struct wlr_keyboard *kb,
 	wl_signal_init(&kb->events.modifiers);
 	wl_signal_init(&kb->events.keymap);
 	wl_signal_init(&kb->events.repeat_info);
-	wl_signal_init(&kb->events.destroy);
 
 	kb->keymap_fd = -1;
 
@@ -147,8 +146,6 @@ void wlr_keyboard_finish(struct wlr_keyboard *kb) {
 		wlr_keyboard_notify_key(kb, &event);  // updates num_keycodes
 	}
 
-	wlr_signal_emit_safe(&kb->events.destroy, kb);
-
 	wlr_input_device_finish(&kb->base);
 
 	/* Finish xkbcommon resources */
diff --git a/types/wlr_keyboard_group.c b/types/wlr_keyboard_group.c
index 465e9944..7f575810 100644
--- a/types/wlr_keyboard_group.c
+++ b/types/wlr_keyboard_group.c
@@ -279,7 +279,7 @@ bool wlr_keyboard_group_add_keyboard(struct wlr_keyboard_group *group,
 	wl_signal_add(&keyboard->events.repeat_info, &device->repeat_info);
 	device->repeat_info.notify = handle_keyboard_repeat_info;
 
-	wl_signal_add(&keyboard->events.destroy, &device->destroy);
+	wl_signal_add(&keyboard->base.events.destroy, &device->destroy);
 	device->destroy.notify = handle_keyboard_destroy;
 
 	struct wlr_keyboard *group_kb = &group->keyboard;