diff --git a/core/arch/arm/kernel/thread_a32.S b/core/arch/arm/kernel/thread_a32.S
index c7016f254a2..ebcf492f4ff 100644
--- a/core/arch/arm/kernel/thread_a32.S
+++ b/core/arch/arm/kernel/thread_a32.S
@@ -656,12 +656,12 @@ thread_abort_handler:
 thread_und_handler:
 UNWIND(	.fnstart)
 UNWIND(	.cantunwind)
-#if defined(CFG_ARM_GICV3)
 	/*
-	 * Disable FIQ which is used as foreign interrupt in GICv3 mode
+	 * Disable both foreign and native interrupts in the thread handlers.
+	 * The tee handlers can decide when the native interrupts should
+	 * be enabled.
 	 */
-	cpsid	f
-#endif
+	cpsid	f	/* IRQ is already masked by the hardware */
 	/*
 	 * Switch to abort mode to use that stack instead.
 	 */
@@ -679,12 +679,12 @@ UNWIND(	.cantunwind)
 	b	.thread_abort_generic
 
 thread_dabort_handler:
-#if defined(CFG_ARM_GICV3)
 	/*
-	 * Disable FIQ which is used as foreign interrupt in GICv3 mode
+	 * Disable both foreign and native interrupts in the thread handlers.
+	 * The tee handlers can decide when the native interrupts should
+	 * be enabled.
 	 */
-	cpsid	f
-#endif
+	cpsid	f	/* IRQ is already masked by the hardware */
 	push	{r0-r11, ip}
 	sub	r1, lr, #8
 	mrs	r0, spsr
@@ -693,12 +693,12 @@ thread_dabort_handler:
 	b	.thread_abort_generic
 
 thread_pabort_handler:
-#if defined(CFG_ARM_GICV3)
 	/*
-	 * Disable FIQ which is used as foreign interrupt in GICv3 mode
+	 * Disable both foreign and native interrupts in the thread handlers.
+	 * The tee handlers can decide when the native interrupts should
+	 * be enabled.
 	 */
-	cpsid	f
-#endif
+	cpsid	f	/* IRQ is already masked by the hardware */
 	push	{r0-r11, ip}
 	sub	r1, lr, #4
 	mrs	r0, spsr
@@ -730,12 +730,12 @@ END_FUNC thread_abort_handler
 LOCAL_FUNC thread_svc_handler , :
 UNWIND(	.fnstart)
 UNWIND(	.cantunwind)
-#if defined(CFG_ARM_GICV3)
 	/*
-	 * Disable FIQ which is used as foreign interrupt in GICv3 mode
+	 * Disable both foreign and native interrupts in the thread handlers.
+	 * The tee handlers can decide when the native interrupts should
+	 * be enabled.
 	 */
-	cpsid	f
-#endif
+	cpsid	f	/* IRQ is already masked by the hardware */
 	push	{r0-r7, lr}
 	mrs	r0, spsr
 	push	{r0}
diff --git a/core/arch/arm/tee/arch_svc.c b/core/arch/arm/tee/arch_svc.c
index a0e78745478..6e4486d8f33 100644
--- a/core/arch/arm/tee/arch_svc.c
+++ b/core/arch/arm/tee/arch_svc.c
@@ -200,6 +200,9 @@ void __weak tee_svc_handler(struct thread_svc_regs *regs)
 	COMPILE_TIME_ASSERT(ARRAY_SIZE(tee_svc_syscall_table) ==
 				(TEE_SCN_MAX + 1));
 
+	/* Enable native interupts */
+	thread_unmask_exceptions(THREAD_EXCP_NATIVE_INTR);
+
 	thread_user_save_vfp();
 
 	/* TA has just entered kernel mode */