diff --git a/include/cm_macros.S b/include/cm_macros.S
index 9eeec18..6901f76 100644
--- a/include/cm_macros.S
+++ b/include/cm_macros.S
@@ -59,6 +59,12 @@
 	 * -----------------------------------------------------
 	 */
 	.macro	handle_sync_exception
+	/* ---------------------------------------------
+	 * Enable Debug and SError interrupts
+	 * ---------------------------------------------
+	 */
+	msr	daifclr, #(DAIF_ABT_BIT | DAIF_DBG_BIT)
+
 	stp	x30, xzr, [sp, #CTX_GPREGS_OFFSET + CTX_GPREG_LR]
 	mrs	x30, esr_el3
 	ubfx	x30, x30, #ESR_EC_SHIFT, #ESR_EC_LENGTH
diff --git a/services/psci/psci_entry.S b/services/psci/psci_entry.S
index 361dfde..32d5c51 100644
--- a/services/psci/psci_entry.S
+++ b/services/psci/psci_entry.S
@@ -76,6 +76,12 @@
 	isb
 
 	/* ---------------------------------------------
+	 * Enable Debug and SError interrupts
+	 * ---------------------------------------------
+	 */
+	msr	daifclr, #(DAIF_ABT_BIT | DAIF_DBG_BIT)
+
+	/* ---------------------------------------------
 	 * Use SP_EL0 for the C runtime stack.
 	 * ---------------------------------------------
 	 */