diff --git a/src/hidapi/windows/hid.c b/src/hidapi/windows/hid.c
index f7069118d..a70b23e3f 100644
--- a/src/hidapi/windows/hid.c
+++ b/src/hidapi/windows/hid.c
@@ -310,6 +310,12 @@ int hid_blacklist(unsigned short vendor_id, unsigned short product_id)
 		return 1;
 	}
 
+	// Sound BlasterX G1 - Causes 10 second stalls when asking for manufacturer's string
+	if ( vendor_id == 0x041E && product_id == 0x3249 )
+	{
+		return 1;
+	}
+
 	return 0;
 }
 
diff --git a/src/joystick/SDL_joystick.c b/src/joystick/SDL_joystick.c
index 5f74ec4d6..406d148e3 100644
--- a/src/joystick/SDL_joystick.c
+++ b/src/joystick/SDL_joystick.c
@@ -1687,13 +1687,10 @@ static SDL_bool SDL_IsPS4RemapperRunning(void)
 
 SDL_bool SDL_ShouldIgnoreJoystick(const char *name, SDL_JoystickGUID guid)
 {
-    /* This list (except for marked entries at the top) is taken from:
+    /* This list is taken from:
        https://raw.githubusercontent.com/denilsonsa/udev-joystick-blacklist/master/generate_rules.py
      */
     static Uint32 joystick_blacklist[] = {
-        /* Sound BlasterX G1 */
-        MAKE_VIDPID(0x041E, 0x3249),
-
         /* Microsoft Microsoft Wireless Optical Desktop® 2.10 */
         /* Microsoft Wireless Desktop - Comfort Edition */
         MAKE_VIDPID(0x045e, 0x009d),