diff --git a/helm/client.sls b/helm/client.sls
index 0c63fbe..8ea7398 100644
--- a/helm/client.sls
+++ b/helm/client.sls
@@ -104,6 +104,7 @@
 wait_for_tiller:
   cmd.run:
     - name: while ! {{ helm_run }} list; do sleep 3; done
+    - timeout: 30
     - env:
       - HELM_HOME: {{ helm_home }}
       - KUBECONFIG: {{ kube_config }}