diff --git a/app/src/hid_listener.c b/app/src/hid_listener.c
index 796ec19b..2b847082 100644
--- a/app/src/hid_listener.c
+++ b/app/src/hid_listener.c
@@ -19,7 +19,8 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 static int hid_listener_keycode_pressed(const struct zmk_keycode_state_changed *ev) {
     int err, explicit_mods_changed, implicit_mods_changed;
 
-    if (zmk_hid_is_pressed(ZMK_HID_USAGE(ev->usage_page, ev->keycode))) {
+    if (!is_mod(ev->usage_page, ev->keycode) &&
+        zmk_hid_is_pressed(ZMK_HID_USAGE(ev->usage_page, ev->keycode))) {
         LOG_DBG("unregistering usage_page 0x%02X keycode 0x%02X since it was already pressed",
                 ev->usage_page, ev->keycode);
         err = zmk_hid_release(ZMK_HID_USAGE(ev->usage_page, ev->keycode));