diff --git a/src/arch/riscv/isa/decoder.isa b/src/arch/riscv/isa/decoder.isa
index 2b46752ffe..d34adfaa02 100644
--- a/src/arch/riscv/isa/decoder.isa
+++ b/src/arch/riscv/isa/decoder.isa
@@ -4344,7 +4344,7 @@ decode QUADRANT default Unknown::unknown() {
                         uint64_t requested_vtype = zimm11;
 
                         Rd_ud = 0;
-                    }}, VectorConfigOp, IsDirectControl, IsCondControl);
+                    }}, VectorConfigOp, IsSerializeAfter, IsNonSpeculative);
                     0x1: decode BIT30 {
                         0x0: vsetvl({{
                             uint64_t rd_bits = RD;
@@ -4353,7 +4353,8 @@ decode QUADRANT default Unknown::unknown() {
                             uint64_t requested_vtype = Rs2_ud;
 
                             Rd_ud = 0;
-                        }}, VectorConfigOp, IsDirectControl, IsCondControl);
+                        }}, VectorConfigOp, IsSerializeAfter,
+                        IsNonSpeculative);
                         0x1: vsetivli({{
                             uint64_t rd_bits = RD;
                             uint64_t rs1_bits = -1;
@@ -4361,7 +4362,8 @@ decode QUADRANT default Unknown::unknown() {
                             uint64_t requested_vtype = zimm10;
 
                             Rd_ud = 0;
-                        }}, VectorConfigOp, IsDirectControl, IsCondControl);
+                        }}, VectorConfigOp, IsSerializeAfter,
+                        IsNonSpeculative);
                     }
                 }
             }