diff --git a/indra/newview/llviewerjoystick.cpp b/indra/newview/llviewerjoystick.cpp
index 551195381..70ce58242 100644
--- a/indra/newview/llviewerjoystick.cpp
+++ b/indra/newview/llviewerjoystick.cpp
@@ -276,7 +276,7 @@ void LLViewerJoystick::init(bool autoenable)
 				gSavedSettings.setString("JoystickInitialized", "SpaceNavigator");
 			}
 		}
-		else if (isJoystickInitialized() && getDescription().find("Xbox") != std::string::npos)
+		else if (getDescription().find("Xbox") != std::string::npos)
 		{
 			sType = XBOX;
 			// It's an Xbox controller, we have defaults for it.