diff --git a/src/core/service.c b/src/core/service.c
index 626a47f7a8..dca8a43cb4 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -2152,10 +2152,6 @@ static void service_enter_dead(Service *s, ServiceResult f, bool allow_restart)
                 (void) unit_set_debug_invocation(UNIT(s), false);
         }
 
-        /* The new state is in effect, let's decrease the fd store ref counter again. Let's also re-add us to the GC
-         * queue, so that the fd store is possibly gc'ed again */
-        unit_add_to_gc_queue(UNIT(s));
-
         /* The next restart might not be a manual stop, hence reset the flag indicating manual stops */
         s->forbid_restart = false;
 
diff --git a/src/core/unit.c b/src/core/unit.c
index e6c5a45dcf..3f4432f655 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -403,7 +403,7 @@ void unit_release_resources(Unit *u) {
                 return;
 
         state = unit_active_state(u);
-        if (!IN_SET(state, UNIT_INACTIVE, UNIT_FAILED))
+        if (!UNIT_IS_INACTIVE_OR_FAILED(state))
                 return;
 
         if (unit_will_restart(u))