diff --git a/sim/riscv/sim-main.c b/sim/riscv/sim-main.c
index 41973d9dd06..378e6f1dc69 100644
--- a/sim/riscv/sim-main.c
+++ b/sim/riscv/sim-main.c
@@ -1299,7 +1299,8 @@ execute_one (SIM_CPU *cpu, unsigned_word iw, const struct riscv_opcode *op)
 
   switch (op->insn_class)
     {
-    case INSN_CLASS_A:
+    case INSN_CLASS_ZAAMO:
+    case INSN_CLASS_ZALRSC:
       return execute_a (cpu, iw, op);
     case INSN_CLASS_C:
       /* Check whether model with C extension is selected.  */