diff --git a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
index 348fbc65828..f866471f934 100644
--- a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
+++ b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
@@ -431,6 +431,12 @@ def set_final_status():
         hookenv.status_set('waiting', 'Waiting to retry addon deployment')
         return
 
+    req_sent = is_state('kubernetes-master.cloud-request-sent')
+    aws_ready = is_state('endpoint.aws.ready')
+    gcp_ready = is_state('endpoint.gcp.ready')
+    if req_sent and not (aws_ready or gcp_ready):
+        hookenv.status_set('waiting', 'waiting for cloud integration')
+
     if addons_configured and not all_kube_system_pods_running():
         hookenv.status_set('waiting', 'Waiting for kube-system pods to start')
         return
@@ -1395,8 +1401,6 @@ def poke_network_unavailable():
     discussion about refactoring the affected code but nothing has happened
     in a while.
     """
-    if is_state('kubernetes-master.networkunavailble.cleared'):
-        return
     cmd = ['kubectl', 'get', 'nodes', '-o', 'json']
 
     try:
@@ -1448,8 +1452,6 @@ def poke_network_unavailable():
                         hookenv.ERROR)
             return
 
-    set_state('kubernetes-master.networkunavailble.cleared')
-
 
 def apiserverVersion():
     cmd = 'kube-apiserver --version'.split()
@@ -1527,11 +1529,11 @@ def request_integration():
     cloud.enable_dns_management()
     cloud.enable_block_storage_management()
     set_state('kubernetes-master.cloud-request-sent')
-    hookenv.status_set('waiting', 'waiting for cloud integration')
 
 
 @when_none('endpoint.aws.joined',
            'endpoint.gcp.joined')
+@when('kubernetes-master.cloud-request-sent')
 def clear_requested_integration():
     remove_state('kubernetes-master.cloud-request-sent')