fix(client): only call .close() when needed#561