diff --git a/engine/client/in_joy.c b/engine/client/in_joy.c
index ff098293..da627ed3 100644
--- a/engine/client/in_joy.c
+++ b/engine/client/in_joy.c
@@ -263,6 +263,11 @@ Axis events
 */
 void Joy_AxisMotionEvent( engineAxis_t engineAxis, short value )
 {
+	if( engineAxis >= JOY_AXIS_NULL )
+		return;
+
+	engineAxis = joyaxesmap[engineAxis];
+
 	if( engineAxis >= JOY_AXIS_NULL )
 		return;