Don't clear the clientId