diff --git a/src/target/riscv/riscv.c b/src/target/riscv/riscv.c
index 9af9a5edc..3a7fe4150 100644
--- a/src/target/riscv/riscv.c
+++ b/src/target/riscv/riscv.c
@@ -2343,6 +2343,14 @@ int riscv_init_registers(struct target *target)
 				case CSR_SATP:
 					r->exist = riscv_supports_extension(target, 'S');
 					break;
+				case CSR_MEDELEG:
+				case CSR_MIDELEG:
+					/* "In systems with only M-mode, or with both M-mode and
+					 * U-mode but without U-mode trap support, the medeleg and
+					 * mideleg registers should not exist." */
+					r->exist = riscv_supports_extension(target, 'S') ||
+						riscv_supports_extension(target, 'N');
+					break;
 			}
 
 			if (!r->exist && expose_csr) {