diff --git a/src/qt/win_joystick_rawinput.c b/src/qt/win_joystick_rawinput.c
index e5d477296..0add0b747 100644
--- a/src/qt/win_joystick_rawinput.c
+++ b/src/qt/win_joystick_rawinput.c
@@ -98,8 +98,6 @@ joystick_add_button(raw_joystick_t *rawjoy, plat_joystick_t *joy, USAGE usage)
 void
 joystick_add_axis(raw_joystick_t *rawjoy, plat_joystick_t *joy, PHIDP_VALUE_CAPS prop)
 {
-    LONG               center;
-
     if (joy->nr_axes >= 8)
         return;
 
@@ -139,14 +137,11 @@ joystick_add_axis(raw_joystick_t *rawjoy, plat_joystick_t *joy, PHIDP_VALUE_CAPS
          * Some joysticks will send -1 in LogicalMax, like Xbox Controllers
          * so we need to mask that to appropriate value (instead of 0xFFFFFFFF)
          */
-        rawjoy->axis[joy->nr_axes].max = prop->LogicalMax & ((1 << prop->BitSize) - 1);
+        rawjoy->axis[joy->nr_axes].max = prop->LogicalMax & ((1ULL << prop->BitSize) - 1);
     }
     rawjoy->axis[joy->nr_axes].min = prop->LogicalMin;
 
-    center = (rawjoy->axis[joy->nr_axes].max - rawjoy->axis[joy->nr_axes].min + 1) / 2;
-
-    if (center != 0x00)
-        joy->nr_axes++;
+    joy->nr_axes++;
 }
 
 void