diff --git a/src/modules/joystick/sdl/JoystickModule.cpp b/src/modules/joystick/sdl/JoystickModule.cpp
index e634c9b5e..a9534c2ae 100644
--- a/src/modules/joystick/sdl/JoystickModule.cpp
+++ b/src/modules/joystick/sdl/JoystickModule.cpp
@@ -495,10 +495,10 @@ void JoystickModule::loadGamepadMappings(const std::string &mappings)
 			mapping.erase(pstartpos, pendpos - pstartpos + 1);
 		}
 
-		success = success || (SDL_GameControllerAddMapping(mapping.c_str()) != -1);
-
-		if (success)
+		if (SDL_GameControllerAddMapping(mapping.c_str()) != -1)
 		{
+			success = true;
+
 			// FIXME: massive hack until missing APIs are added to SDL 2:
 			// https://bugzilla.libsdl.org/show_bug.cgi?id=1975
 			std::string guid = mapping.substr(0, mapping.find_first_of(','));