diff --git a/pkg/client/machine.go b/pkg/client/machine.go
index 1f022af8..3efee19b 100644
--- a/pkg/client/machine.go
+++ b/pkg/client/machine.go
@@ -134,7 +134,9 @@ func (cli *Client) WaitClusterReady(ctx context.Context, timeout time.Duration)
 	listMachines := func() error {
 		_, err := cli.ListMachines(ctx, nil)
 		if err != nil {
-			if s, ok := status.FromError(err); ok && s.Code() == codes.Unavailable {
+			if s, ok := status.FromError(err); ok &&
+				// TODO: remove FailedPrecondition after releading 0.17.
+				(s.Code() == codes.Unavailable || s.Code() == codes.FailedPrecondition) {
 				// Machine is not ready yet, retry.
 				return err
 			}