diff --git a/app/include/zmk/hid.h b/app/include/zmk/hid.h
index d09ffde4..1ce5cc9b 100644
--- a/app/include/zmk/hid.h
+++ b/app/include/zmk/hid.h
@@ -56,6 +56,19 @@ static const u8_t zmk_hid_report_desc[] = {
     HID_MI_INPUT,
     0x02,
 
+    /* USAGE_PAGE (Keypad) */
+    HID_GI_USAGE_PAGE,
+    USAGE_GEN_DESKTOP_KEYPAD,
+    /* REPORT_SIZE (8) */
+    HID_GI_REPORT_SIZE,
+    0x08,
+    /* REPORT_COUNT (1) */
+    HID_GI_REPORT_COUNT,
+    0x01,
+    /* INPUT (Cnst,Var,Abs) */
+    HID_MI_INPUT,
+    0x03,
+
     /* USAGE_PAGE (Keypad) */
     HID_GI_USAGE_PAGE,
     USAGE_GEN_DESKTOP_KEYPAD,
@@ -131,6 +144,7 @@ static const u8_t zmk_hid_report_desc[] = {
 
 struct zmk_hid_keypad_report_body {
     zmk_mod_flags modifiers;
+    u8_t _reserved;
     u8_t keys[ZMK_HID_KEYPAD_NKRO_SIZE];
 } __packed;
 
diff --git a/app/src/hid.c b/app/src/hid.c
index 28efee15..207b1adf 100644
--- a/app/src/hid.c
+++ b/app/src/hid.c
@@ -9,8 +9,8 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 #include <zmk/hid.h>
 
-static struct zmk_hid_keypad_report kp_report = {.report_id = 1,
-                                                 .body = {.modifiers = 0, .keys = {0}}};
+static struct zmk_hid_keypad_report kp_report = {
+    .report_id = 1, .body = {.modifiers = 0, ._reserved = 0, .keys = {0}}};
 
 static struct zmk_hid_consumer_report consumer_report = {.report_id = 2, .body = {.keys = {0}}};