diff --git a/llvm/utils/TableGen/PrinterCapstone.cpp b/llvm/utils/TableGen/PrinterCapstone.cpp
index 107f29598550..bc6c240268ca 100644
--- a/llvm/utils/TableGen/PrinterCapstone.cpp
+++ b/llvm/utils/TableGen/PrinterCapstone.cpp
@@ -3953,7 +3953,8 @@ void printInsnAliasEnum(CodeGenTarget const &Target,
                      getLLVMInstEnumName(Target.getName().upper(), RealInst) +
                      "\n";
 
-    bool ReplaceDotInMnemonic = Target.getName().equals_insensitive("PPC") ? false : true;
+    bool ReplaceDotInMnemonic = !(Target.getName().equals_insensitive("PPC") ||
+                                  Target.getName().equals_insensitive("RISCV"));
     AliasMnemMap << "\t{ " + NormAliasMnem + ", \"" +
                         getNormalMnemonic(Target.getName(), AliasMnemonic, false,
                                            ReplaceDotInMnemonic) +