diff --git a/src/Joystick/JoystickSDL.cc b/src/Joystick/JoystickSDL.cc
index c23448026535b13dd9eab5f8d35a2e8986f04f0d..854ac44078f7cd913c1c9ef1cb6910a4c11259a8 100644
--- a/src/Joystick/JoystickSDL.cc
+++ b/src/Joystick/JoystickSDL.cc
@@ -49,7 +49,7 @@ QMap<QString, Joystick*> JoystickSDL::discover(MultiVehicleManager* _multiVehicl
             SDL_JoystickClose(sdlJoystick);
 
             qCDebug(JoystickLog) << "\t" << name << "axes:" << axisCount << "buttons:" << buttonCount << "hats:" << hatCount << "isGC:" << isGameController;
-            ret[name] = new JoystickSDL(name, axisCount, buttonCount, hatCount, i, isGameController, _multiVehicleManager);
+            ret[name] = new JoystickSDL(name, qMax(0,axisCount), qMax(0,buttonCount), qMax(0,hatCount), i, isGameController, _multiVehicleManager);
         } else {
             qCDebug(JoystickLog) << "\tSkipping duplicate" << name;
         }