diff --git a/src/joystick/windows/SDL_xinputjoystick.c b/src/joystick/windows/SDL_xinputjoystick.c
index b5369bb616cd8..253e7e1086825 100644
--- a/src/joystick/windows/SDL_xinputjoystick.c
+++ b/src/joystick/windows/SDL_xinputjoystick.c
@@ -552,6 +552,12 @@ void SDL_XINPUT_JoystickClose(SDL_Joystick *joystick)
 
 void SDL_XINPUT_JoystickQuit(void)
 {
+    int iuserid;
+
+    for (iuserid = 0; iuserid < XUSER_MAX_COUNT; ++iuserid) {
+        DelXInputDevice(iuserid);
+    }
+
     if (s_bXInputEnabled) {
         WIN_UnloadXInputDLL();
     }