diff --git a/components/lwp/arch/risc-v/rv64/lwp_arch.h b/components/lwp/arch/risc-v/rv64/lwp_arch.h
index 7a4a8b3f42..f1d1176f5c 100644
--- a/components/lwp/arch/risc-v/rv64/lwp_arch.h
+++ b/components/lwp/arch/risc-v/rv64/lwp_arch.h
@@ -29,7 +29,7 @@
 #define USER_VADDR_START    0x00001000UL
 #define USER_VADDR_TOP      0x003ffffff000UL
 #define USER_STACK_VSTART   0x000270000000UL
-#define USER_STACK_VEND     USER_HEAP_VADDR
+#define USER_STACK_VEND     (USER_HEAP_VADDR - (ARCH_PAGE_SIZE * 8)) /* start of ARGC ARGV ENVP. FIXME: space is ARG_MAX */
 #define USER_HEAP_VADDR     0x000300000000UL
 #define USER_HEAP_VEND      USER_VADDR_TOP
 #define USER_LOAD_VADDR     0x200000000