diff --git a/dlls/winejoystick.drv/joystick.c b/dlls/winejoystick.drv/joystick.c
index 2d3e514877a..41d6eb8dbf1 100644
--- a/dlls/winejoystick.drv/joystick.c
+++ b/dlls/winejoystick.drv/joystick.c
@@ -78,7 +78,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(joystick);
 
 #ifdef HAVE_LINUX_JOYSTICK_H
 
-#define MAXJOYSTICK	(JOYSTICKID2 + 1)
+#define MAXJOYSTICK (JOYSTICKID2 + 30)
 
 typedef struct tagWINE_JSTCK {
     int		joyIntf;
diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c
index 3577bdd5e38..f3cffdf245d 100644
--- a/dlls/winmm/joystick.c
+++ b/dlls/winmm/joystick.c
@@ -48,7 +48,7 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(winmm);
 
-#define MAXJOYSTICK	(JOYSTICKID2 + 1)
+#define MAXJOYSTICK (JOYSTICKID2 + 30)
 #define JOY_PERIOD_MIN	(10)	/* min Capture time period */
 #define JOY_PERIOD_MAX	(1000)	/* max Capture time period */