diff --git a/headers/private/system/thread_defs.h b/headers/private/system/thread_defs.h
index 0f032c0f8e..d601cc7b94 100644
--- a/headers/private/system/thread_defs.h
+++ b/headers/private/system/thread_defs.h
@@ -14,7 +14,7 @@
 /** Size of the stack given to teams in user space */
 #define USER_STACK_GUARD_SIZE		(4 * B_PAGE_SIZE)		// 16 kB
 #define MIN_USER_STACK_SIZE			(2 * B_PAGE_SIZE)		// 8 kB
-#define MAX_USER_STACK_SIZE			(4096 * B_PAGE_SIZE)	// 16 MB
+#define MAX_USER_STACK_SIZE			(16384 * B_PAGE_SIZE)	// 64 MB
 #define USER_MAIN_THREAD_STACK_SIZE	MAX_USER_STACK_SIZE
 #define USER_STACK_SIZE				(64 * B_PAGE_SIZE)		// 256 kB