diff --git a/disasm/isa_parser.cc b/disasm/isa_parser.cc
index 104a4dc9..a2bfc857 100644
--- a/disasm/isa_parser.cc
+++ b/disasm/isa_parser.cc
@@ -394,6 +394,7 @@ isa_parser_t::isa_parser_t(const char* str, const char *priv)
       extension_table[EXT_ZICFILP] = true;
     } else if (ext_str == "zicfiss") {
       extension_table[EXT_ZICFISS] = true;
+      extension_table[EXT_ZAAMO] = true;
     } else if (ext_str == "smmpm") {
       extension_table[EXT_SMMPM] = true;
     } else if (ext_str == "smnpm") {
diff --git a/riscv/insns/ssamoswap_d.h b/riscv/insns/ssamoswap_d.h
index 4169ac3e..0aa30cc1 100644
--- a/riscv/insns/ssamoswap_d.h
+++ b/riscv/insns/ssamoswap_d.h
@@ -1,5 +1,4 @@
 require_extension(EXT_ZICFISS);
-require_extension(EXT_ZAAMO);
 require_rv64;
 
 DECLARE_XENVCFG_VARS(SSE);
diff --git a/riscv/insns/ssamoswap_w.h b/riscv/insns/ssamoswap_w.h
index d971ebec..7abc3a36 100644
--- a/riscv/insns/ssamoswap_w.h
+++ b/riscv/insns/ssamoswap_w.h
@@ -1,5 +1,4 @@
 require_extension(EXT_ZICFISS);
-require_extension(EXT_ZAAMO);
 
 DECLARE_XENVCFG_VARS(SSE);
 require_envcfg(SSE);