diff --git a/libcpu/arm/stm32/context_rvds.S b/libcpu/arm/stm32/context_rvds.S
index 11e88c351c343c1ea9a472db75ec6445ce225bba..6904f5856373adb95ebf8b6120905fa4d1bd82cd 100644
--- a/libcpu/arm/stm32/context_rvds.S
+++ b/libcpu/arm/stm32/context_rvds.S
@@ -81,6 +81,11 @@ rt_hw_context_switch    PROC
 ; psr, pc, lr, r12, r3, r2, r1, r0 are pushed into [from] stack
 rt_hw_pend_sv	PROC
 	EXPORT rt_hw_pend_sv
+
+	; disable interrupt to protect context switch
+	MRS		r2, PRIMASK
+	CPSID   I
+
 	; clear rt_thread_switch_interrput_flag to 0
 	LDR		r0, =rt_thread_switch_interrput_flag
 	MOV		r1, #0x00
@@ -103,6 +108,9 @@ swtich_to_thread
 	LDMFD	r1!, {r4 - r11}			; pop r4 - r11 register
 	MSR		psp, r1					; update stack pointer
 
+	; restore interrupt
+	MSR		PRIMASK, r2
+
 	ORR     lr, lr, #0x04
 	BX		lr
 	ENDP
@@ -183,7 +191,6 @@ rt_hw_interrupt_thread_switch	PROC
 
 _no_switch
 	BX		lr
-	NOP
 
 	ENDP