diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index ed2f008..0607337 100644
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@ -1130,11 +1130,11 @@ static __u8 *sony_report_fixup(struct hid_device *hdev, __u8 *rdesc,
         * the gyroscope values to corresponding axes so we need a
         * modified one.
         */
-       if ((sc->quirks & DUALSHOCK4_CONTROLLER_USB) && *rsize == 467) {
+       if ((sc->quirks & DUALSHOCK4_CONTROLLER_USB) && (*rsize == 467 || *rsize == 499)) {
                hid_info(hdev, "Using modified Dualshock 4 report descriptor with gyroscope axes\n");
                rdesc = dualshock4_usb_rdesc;
                *rsize = sizeof(dualshock4_usb_rdesc);
-       } else if ((sc->quirks & DUALSHOCK4_CONTROLLER_BT) && *rsize == 357) {
+       } else if ((sc->quirks & DUALSHOCK4_CONTROLLER_BT) && (*rsize == 357 || *rsize == 365)) {
                hid_info(hdev, "Using modified Dualshock 4 Bluetooth report descriptor\n");
                rdesc = dualshock4_bt_rdesc;
                *rsize = sizeof(dualshock4_bt_rdesc);