Fix no client check