Fix bad behavor while pinging Clients

fixes #6941