diff --git a/lib/sbi/sbi_irqchip.c b/lib/sbi/sbi_irqchip.c
index 0ae604a..94832c8 100644
--- a/lib/sbi/sbi_irqchip.c
+++ b/lib/sbi/sbi_irqchip.c
@@ -37,8 +37,8 @@ int sbi_irqchip_init(struct sbi_scratch *scratch, bool cold_boot)
 	if (rc)
 		return rc;
 
-	if (ext_irqfn != default_irqfn)
-		csr_set(CSR_MIE, MIP_MEIP);
+	csr_set(CSR_MIE, MIP_MEIP | MIP_SEIP);
+	csr_set(CSR_MSTATUS, MSTATUS_MIE | MSTATUS_SIE);
 
 	return 0;
 }
@@ -47,8 +47,8 @@ void sbi_irqchip_exit(struct sbi_scratch *scratch)
 {
 	const struct sbi_platform *plat = sbi_platform_ptr(scratch);
 
-	if (ext_irqfn != default_irqfn)
-		csr_clear(CSR_MIE, MIP_MEIP);
+	csr_clear(CSR_MIE, MIP_MEIP | MIP_SEIP);
+	csr_clear(CSR_MSTATUS, MSTATUS_MIE | MSTATUS_SIE);
 
 	sbi_platform_irqchip_exit(plat);
 }