diff --git a/src/server/frontend_wayland/text_input_v3.cpp b/src/server/frontend_wayland/text_input_v3.cpp
index 422024a5f9..7166157365 100644
--- a/src/server/frontend_wayland/text_input_v3.cpp
+++ b/src/server/frontend_wayland/text_input_v3.cpp
@@ -333,6 +333,7 @@ mf::TextInputV3::TextInputV3(
 mf::TextInputV3::~TextInputV3()
 {
     seat.remove_focus_listener(client, this);
+    ctx->device_registry->remove_device(keyboard_device);
     ctx->text_input_hub->deactivate_handler(handler);
 }