diff --git a/arch/risc-v/src/common/riscv_addrenv.c b/arch/risc-v/src/common/riscv_addrenv.c
index cb49c1a51da..f26a5d11c28 100644
--- a/arch/risc-v/src/common/riscv_addrenv.c
+++ b/arch/risc-v/src/common/riscv_addrenv.c
@@ -132,9 +132,9 @@ static void map_spgtables(arch_addrenv_t *addrenv, uintptr_t vaddr)
 
   for (i = 0; i < (ARCH_SPGTS - 1); i++)
     {
-      uintptr_t next = riscv_pgvaddr(addrenv->spgtables[i + 1]);
+      uintptr_t next = addrenv->spgtables[i + 1];
       mmu_ln_setentry(i + 1, prev, next, vaddr, MMU_UPGT_FLAGS);
-      prev = next;
+      prev = riscv_pgvaddr(next);
     }
 }