diff --git a/src/arch/riscv/remote_gdb.cc b/src/arch/riscv/remote_gdb.cc
index df660d40d2..661fe2e2ca 100644
--- a/src/arch/riscv/remote_gdb.cc
+++ b/src/arch/riscv/remote_gdb.cc
@@ -218,7 +218,8 @@ RemoteGDB::acc(Addr va, size_t len)
 
         PrivilegeMode pmode = mmu->getMemPriv(context(), BaseMMU::Read);
         SATP satp = context()->readMiscReg(MISCREG_SATP);
-        if (pmode != PrivilegeMode::PRV_M &&
+        MISA misa = tc->readMiscRegNoEffect(MISCREG_ISA);
+        if (misa.rvs && pmode != PrivilegeMode::PRV_M &&
             satp.mode != AddrXlateMode::BARE) {
             Walker *walker = mmu->getDataWalker();
             Fault fault = walker->startFunctional(
diff --git a/src/arch/riscv/tlb.cc b/src/arch/riscv/tlb.cc
index ac8c8ae029..a8b6e75aed 100644
--- a/src/arch/riscv/tlb.cc
+++ b/src/arch/riscv/tlb.cc
@@ -341,9 +341,12 @@ TLB::translate(const RequestPtr &req, ThreadContext *tc,
 
     if (FullSystem) {
         PrivilegeMode pmode = getMemPriv(tc, mode);
+        MISA misa = tc->readMiscRegNoEffect(MISCREG_ISA);
         SATP satp = tc->readMiscReg(MISCREG_SATP);
-        if (pmode == PrivilegeMode::PRV_M || satp.mode == AddrXlateMode::BARE)
+        if (!misa.rvs || pmode == PrivilegeMode::PRV_M ||
+            satp.mode == AddrXlateMode::BARE) {
             req->setFlags(Request::PHYSICAL);
+        }
 
         Fault fault;
         if (req->getFlags() & Request::PHYSICAL) {
@@ -434,8 +437,9 @@ TLB::translateFunctional(const RequestPtr &req, ThreadContext *tc,
         MMU *mmu = static_cast<MMU *>(tc->getMMUPtr());
 
         PrivilegeMode pmode = mmu->getMemPriv(tc, mode);
+        MISA misa = tc->readMiscRegNoEffect(MISCREG_ISA);
         SATP satp = tc->readMiscReg(MISCREG_SATP);
-        if (pmode != PrivilegeMode::PRV_M &&
+        if (misa.rvs && pmode != PrivilegeMode::PRV_M &&
             satp.mode != AddrXlateMode::BARE) {
             Walker *walker = mmu->getDataWalker();
             unsigned logBytes;