diff --git a/app/include/dt-bindings/zmk/hid_usage_pages.h b/app/include/dt-bindings/zmk/hid_usage_pages.h
index f38f4fd3..830641f0 100644
--- a/app/include/dt-bindings/zmk/hid_usage_pages.h
+++ b/app/include/dt-bindings/zmk/hid_usage_pages.h
@@ -12,7 +12,7 @@
 
 #define HID_USAGE(page, id) ((page << 16) | id)
 #define HID_USAGE_ID(usage) (usage & 0xFFFF)
-#define HID_USAGE_PAGE(usage) (usage >> 16)
+#define HID_USAGE_PAGE(usage) ((usage >> 16) & 0xFF)
 
 /* WARNING: DEPRECATED from dt-bindings/zmk/keys.h */
 #define USAGE_KEYPAD (0x07)   // WARNING: DEPRECATED (DO NOT USE)
diff --git a/app/include/zmk/events/keycode_state_changed.h b/app/include/zmk/events/keycode_state_changed.h
index 466bbd76..924eb223 100644
--- a/app/include/zmk/events/keycode_state_changed.h
+++ b/app/include/zmk/events/keycode_state_changed.h
@@ -23,7 +23,7 @@ ZMK_EVENT_DECLARE(zmk_keycode_state_changed);
 
 static inline struct zmk_keycode_state_changed_event *
 zmk_keycode_state_changed_from_encoded(uint32_t encoded, bool pressed, int64_t timestamp) {
-    uint16_t page = HID_USAGE_PAGE(encoded) & 0xFF;
+    uint16_t page = HID_USAGE_PAGE(encoded);
     uint16_t id = HID_USAGE_ID(encoded);
     uint8_t implicit_modifiers = 0x00;
     uint8_t explicit_modifiers = 0x00;
diff --git a/app/src/behaviors/behavior_sticky_key.c b/app/src/behaviors/behavior_sticky_key.c
index 20af93a8..d2331a78 100644
--- a/app/src/behaviors/behavior_sticky_key.c
+++ b/app/src/behaviors/behavior_sticky_key.c
@@ -190,7 +190,7 @@ static int sticky_key_keycode_state_changed_listener(const zmk_event_t *eh) {
 
         if (strcmp(sticky_key->config->behavior.behavior_dev, "KEY_PRESS") == 0 &&
             HID_USAGE_ID(sticky_key->param1) == ev->keycode &&
-            (HID_USAGE_PAGE(sticky_key->param1) & 0xFF) == ev->usage_page &&
+            HID_USAGE_PAGE(sticky_key->param1) == ev->usage_page &&
             SELECT_MODS(sticky_key->param1) == ev->implicit_modifiers) {
             // don't catch key down events generated by the sticky key behavior itself
             continue;