diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index f8517618..6f5e265b 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -2166,6 +2166,9 @@ void I_InitJoystick(void)
 	if (M_CheckParm("-nojoy"))
 		return;
 
+	if (M_CheckParm("-noxinput"))
+		SDL_SetHintWithPriority("SDL_XINPUT_ENABLED", "0", SDL_HINT_OVERRIDE);
+
 	if (SDL_WasInit(SDL_INIT_JOYSTICK) == 0)
 	{
 		CONS_Printf("I_InitJoystick()...\n");