diff --git a/cmd/clusterctl/clusterdeployer/clusterclient/clusterclient.go b/cmd/clusterctl/clusterdeployer/clusterclient/clusterclient.go
index 82820c3c714a..454375ae49c7 100644
--- a/cmd/clusterctl/clusterdeployer/clusterclient/clusterclient.go
+++ b/cmd/clusterctl/clusterdeployer/clusterclient/clusterclient.go
@@ -752,6 +752,9 @@ func (c *client) WaitForResourceStatuses() error {
 			if reflect.DeepEqual(clusterv1.ClusterStatus{}, cluster.Status) {
 				return false, nil
 			}
+			if cluster.Status.ProviderStatus == nil {
+				return false, nil
+			}
 		}
 		machineDeployments, err := c.clientSet.ClusterV1alpha1().MachineDeployments("").List(metav1.ListOptions{})
 		if err != nil {
@@ -779,6 +782,9 @@ func (c *client) WaitForResourceStatuses() error {
 			if reflect.DeepEqual(clusterv1.MachineStatus{}, m.Status) {
 				return false, nil
 			}
+			if m.Status.ProviderStatus == nil {
+				return false, nil
+			}
 		}
 
 		return true, nil