diff --git a/app/Kconfig b/app/Kconfig
index cda0fbe3116..90186a6d979 100644
--- a/app/Kconfig
+++ b/app/Kconfig
@@ -65,6 +65,14 @@ config ZMK_HID_KEYBOARD_REPORT_SIZE
 
 endif
 
+if ZMK_HID_REPORT_TYPE_NKRO
+
+config ZMK_HID_KEYBOARD_EXTENDED_REPORT
+    bool "Enable extended NKRO report"
+    default n
+
+endif
+
 config ZMK_HID_CONSUMER_REPORT_SIZE
     int "# Consumer Keys Reportable"
     default 6
diff --git a/app/include/zmk/hid.h b/app/include/zmk/hid.h
index 88ad0434101..87f88498c7f 100644
--- a/app/include/zmk/hid.h
+++ b/app/include/zmk/hid.h
@@ -13,7 +13,11 @@
 #include <dt-bindings/zmk/hid_usage.h>
 #include <dt-bindings/zmk/hid_usage_pages.h>
 
+#if IS_ENABLED(CONFIG_ZMK_HID_KEYBOARD_EXTENDED_REPORT)
 #define ZMK_HID_KEYBOARD_NKRO_MAX_USAGE HID_USAGE_KEY_KEYBOARD_LANG8
+#else
+#define ZMK_HID_KEYBOARD_NKRO_MAX_USAGE HID_USAGE_KEY_KEYPAD_EQUAL
+#endif
 
 #define COLLECTION_REPORT 0x03