diff --git a/src/lib/libkrbn/include/libkrbn/impl/libkrbn_hid_value_monitor.hpp b/src/lib/libkrbn/include/libkrbn/impl/libkrbn_hid_value_monitor.hpp
index 3b78e9a15..7b2b3d02f 100644
--- a/src/lib/libkrbn/include/libkrbn/impl/libkrbn_hid_value_monitor.hpp
+++ b/src/lib/libkrbn/include/libkrbn/impl/libkrbn_hid_value_monitor.hpp
@@ -68,6 +68,8 @@ class libkrbn_hid_value_monitor final {
       auto device_id = krbn::make_device_id(registry_entry_id);
 
       hid_queue_value_monitors_.erase(device_id);
+
+      krbn::hat_switch_converter::get_global_hat_switch_converter()->erase_device(device_id);
     });
 
     hid_manager_->error_occurred.connect([](auto&& message, auto&& kern_return) {