diff --git a/src/core/unit.c b/src/core/unit.c
index dc8bf83383..9b36b225fa 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -2676,6 +2676,9 @@ bool unit_inactive_or_pending(Unit *u) {
 
         /* Returns true if the unit is inactive or going down */
 
+        if (UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(u)))
+                return true;
+
         if (unit_stop_pending(u))
                 return true;