Fix shutdown code path

1 job for master in 7 minutes and 7 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #2986
test-client

00:07:07

62.6%