diff --git a/arch/arm/core/aarch32/userspace.S b/arch/arm/core/aarch32/userspace.S
index 904453ca4946c..eea1db9ee8e15 100644
--- a/arch/arm/core/aarch32/userspace.S
+++ b/arch/arm/core/aarch32/userspace.S
@@ -524,9 +524,6 @@ dispatch_syscall:
 #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
     /* set stack back to unprivileged stack */
     ldr ip, [sp,#12]
-#endif
-
-#if !defined(CONFIG_ARMV7_R)
     msr PSP, ip
 #endif