diff --git a/src/core/manager.c b/src/core/manager.c
index accf9c8ff9..165914b2a5 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -5119,6 +5119,7 @@ static int manager_dispatch_pidref_transport_fd(sd_event_source *source, int fd,
 
         if (n != sizeof(child_pid)) {
                 log_warning("Got pidref message of unexpected size %zi (expected %zu), ignoring.", n, sizeof(child_pid));
+                cmsg_close_all(&msghdr);
                 return 0;
         }
 
@@ -5138,6 +5139,8 @@ static int manager_dispatch_pidref_transport_fd(sd_event_source *source, int fd,
                 }
         }
 
+        /* From this point on, the fds are owned by our local variables. Call cmsg_close_all no more. */
+
         /* Verify and set parent pidref. */
         if (!ucred || !pid_is_valid(ucred->pid)) {
                 log_warning("Received pidref message without valid credentials. Ignoring.");