diff --git a/helm/client.sls b/helm/client.sls
index 5c02416..e51f15c 100644
--- a/helm/client.sls
+++ b/helm/client.sls
@@ -51,6 +51,14 @@
     - require:
       - cmd: prepare_client
 
+wait_for_tiller:
+  cmd.run:
+    - name: while ! helm list; do sleep 3; done
+    - env:
+      - HELM_HOME: {{ helm_home }}
+    - onchanges:
+      - cmd: install_tiller
+
 {%- for repo_name, repo_url in client.repos.items() %}
 ensure_{{ repo_name }}_repo:
   cmd.run:
@@ -76,7 +84,7 @@
         {{ release['values']|yaml(False)|indent(8) }}
     {% endif %}
     - require:
-      - cmd: prepare_client
+      - cmd: wait_for_tiller
 {%- endfor %}
 
 {%- endif %}