diff --git a/arch/risc-v/src/common/riscv_blocktask.c b/arch/risc-v/src/common/riscv_blocktask.c
index 00fa65d0ab6..b3833c225a4 100644
--- a/arch/risc-v/src/common/riscv_blocktask.c
+++ b/arch/risc-v/src/common/riscv_blocktask.c
@@ -136,15 +136,6 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state)
 
           struct tcb_s *nexttcb = this_task();
 
-#ifdef CONFIG_ARCH_ADDRENV
-          /* Make sure that the address environment for the previously
-           * running task is closed down gracefully (data caches dump,
-           * MMU flushed) and set up the address environment for the new
-           * thread at the head of the ready-to-run list.
-           */
-
-          (void)group_addrenv(nexttcb);
-#endif
           /* Reset scheduler parameters */
 
           nxsched_resume_scheduler(nexttcb);
diff --git a/arch/risc-v/src/common/riscv_exit.c b/arch/risc-v/src/common/riscv_exit.c
index f8647beb12f..45f23cda7a8 100644
--- a/arch/risc-v/src/common/riscv_exit.c
+++ b/arch/risc-v/src/common/riscv_exit.c
@@ -137,16 +137,6 @@ void up_exit(int status)
 
   nxsched_resume_scheduler(tcb);
 
-#ifdef CONFIG_ARCH_ADDRENV
-  /* Make sure that the address environment for the previously running
-   * task is closed down gracefully (data caches dump, MMU flushed) and
-   * set up the address environment for the new thread at the head of
-   * the ready-to-run list.
-   */
-
-  group_addrenv(tcb);
-#endif
-
   /* Then switch contexts */
 
   riscv_fullcontextrestore(tcb->xcp.regs);
diff --git a/arch/risc-v/src/common/riscv_releasepending.c b/arch/risc-v/src/common/riscv_releasepending.c
index 234c660c6b6..37978f13638 100644
--- a/arch/risc-v/src/common/riscv_releasepending.c
+++ b/arch/risc-v/src/common/riscv_releasepending.c
@@ -107,15 +107,6 @@ void up_release_pending(void)
 
           struct tcb_s *nexttcb = this_task();
 
-#ifdef CONFIG_ARCH_ADDRENV
-          /* Make sure that the address environment for the previously
-           * running task is closed down gracefully (data caches dump,
-           * MMU flushed) and set up the address environment for the new
-           * thread at the head of the ready-to-run list.
-           */
-
-          (void)group_addrenv(nexttcb);
-#endif
           /* Update scheduler parameters */
 
           nxsched_resume_scheduler(nexttcb);
diff --git a/arch/risc-v/src/common/riscv_reprioritizertr.c b/arch/risc-v/src/common/riscv_reprioritizertr.c
index c9d42232e5f..02c6e9f2e02 100644
--- a/arch/risc-v/src/common/riscv_reprioritizertr.c
+++ b/arch/risc-v/src/common/riscv_reprioritizertr.c
@@ -159,15 +159,6 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
 
               struct tcb_s *nexttcb = this_task();
 
-#ifdef CONFIG_ARCH_ADDRENV
-              /* Make sure that the address environment for the previously
-               * running task is closed down gracefully (data caches dump,
-               * MMU flushed) and set up the address environment for the new
-               * thread at the head of the ready-to-run list.
-               */
-
-              (void)group_addrenv(nexttcb);
-#endif
               /* Update scheduler parameters */
 
               nxsched_resume_scheduler(nexttcb);
diff --git a/arch/risc-v/src/common/riscv_unblocktask.c b/arch/risc-v/src/common/riscv_unblocktask.c
index 678f8958712..c72360dadcf 100644
--- a/arch/risc-v/src/common/riscv_unblocktask.c
+++ b/arch/risc-v/src/common/riscv_unblocktask.c
@@ -122,15 +122,6 @@ void up_unblock_task(struct tcb_s *tcb)
 
           struct tcb_s *nexttcb = this_task();
 
-#ifdef CONFIG_ARCH_ADDRENV
-          /* Make sure that the address environment for the previously
-           * running task is closed down gracefully (data caches dump,
-           * MMU flushed) and set up the address environment for the new
-           * thread at the head of the ready-to-run list.
-           */
-
-          (void)group_addrenv(nexttcb);
-#endif
           /* Update scheduler parameters */
 
           nxsched_resume_scheduler(nexttcb);