diff --git a/input/input_mapper.c b/input/input_mapper.c
index 253ffcf112..e4140765ee 100644
--- a/input/input_mapper.c
+++ b/input/input_mapper.c
@@ -191,7 +191,8 @@ void input_mapper_poll(input_mapper_t *handle)
                   settings->uints.input_remap_ids[i][k];
 
                if (
-                     (current_axis_value != 0) && 
+                     (abs(current_axis_value) > 
+                     *input_driver_get_float(INPUT_ACTION_AXIS_THRESHOLD) * 32767) && 
                      (k != remap_axis)         &&
                      (remap_axis != RARCH_UNMAPPED)
                   )