diff --git a/src/rmvs/rmvs_step.f90 b/src/rmvs/rmvs_step.f90
index 098622037..bf8f9cb88 100644
--- a/src/rmvs/rmvs_step.f90
+++ b/src/rmvs/rmvs_step.f90
@@ -28,7 +28,7 @@ module subroutine rmvs_step_system(self, param, t, dt)
       logical :: lencounter, lfirstpl
       real(DP), dimension(:,:), allocatable :: rbeg, rend, vbeg
 
-      if (self%tp%nbody == 0) then
+      if ((self%tp%nbody == 0) .or. (self%pl%nbody == 0)) then
          call whm_step_system(self, param, t, dt)
       else
          select type(cb => self%cb)