diff --git a/src/whm/whm_kick.f90 b/src/whm/whm_kick.f90
index 93b448967..2e70a431e 100644
--- a/src/whm/whm_kick.f90
+++ b/src/whm/whm_kick.f90
@@ -92,7 +92,7 @@ module subroutine whm_kick_getacch_tp(self, nbody_system, param, t, lbeg)
       associate(tp => self, pl => nbody_system%pl, cb => nbody_system%cb)
          npl = nbody_system%pl%nbody
          ntp = self%nbody
-         if (ntp == 0 .or. npl == 0) return
+         if (ntp == 0 .and. npl == 0) return
          nbody_system%lbeg = lbeg
 
          if (lbeg) then