diff --git a/src/input/input_device.cpp b/src/input/input_device.cpp
index 3f23b054f..a5b75fb56 100644
--- a/src/input/input_device.cpp
+++ b/src/input/input_device.cpp
@@ -219,10 +219,10 @@ bool GamePadDevice::processAndMapInput(Input::InputType type, const int id, cons
 
             return false;
         }
+        
+        // If axis did not send proper values yet, ignore it.
+        if (!m_axis_ok[id]) return false;
     }
-
-    // If axis did not send proper values yet, ignore it.
-    if (!m_axis_ok[id]) return false;
     
     if (m_configuration != NULL)
     {