diff --git a/applications/main/bad_usb/resources/badusb/assets/layouts/ja-JP.kl b/applications/main/bad_usb/resources/badusb/assets/layouts/ja-JP.kl
new file mode 100644
index 000000000000..41052185ec8e
Binary files /dev/null and b/applications/main/bad_usb/resources/badusb/assets/layouts/ja-JP.kl differ
diff --git a/targets/f7/furi_hal/furi_hal_usb_hid.c b/targets/f7/furi_hal/furi_hal_usb_hid.c
index c83261226ec2..66370d5cae82 100644
--- a/targets/f7/furi_hal/furi_hal_usb_hid.c
+++ b/targets/f7/furi_hal/furi_hal_usb_hid.c
@@ -66,10 +66,10 @@ static const uint8_t hid_report_desc[] = {
         HID_REPORT_COUNT(HID_KB_MAX_KEYS),
         HID_REPORT_SIZE(8),
         HID_LOGICAL_MINIMUM(0),
-        HID_LOGICAL_MAXIMUM(101),
+        HID_RI_LOGICAL_MAXIMUM(16, 255),
         HID_USAGE_PAGE(HID_DESKTOP_KEYPAD),
         HID_USAGE_MINIMUM(0),
-        HID_USAGE_MAXIMUM(101),
+        HID_RI_USAGE_MAXIMUM(16, 255),
         // Input - Key codes
         HID_INPUT(HID_IOF_DATA | HID_IOF_ARRAY | HID_IOF_ABSOLUTE),
     HID_END_COLLECTION,