diff --git a/kubernetes/master/controller.sls b/kubernetes/master/controller.sls
index ce31e34..90de94d 100644
--- a/kubernetes/master/controller.sls
+++ b/kubernetes/master/controller.sls
@@ -353,7 +353,12 @@
 
 kubernetes_namespace_delete_{{ name }}:
   cmd.run:
-    - name: kubectl get ns -o=custom-columns=NAME:.metadata.name | grep -v NAME | grep "{{ name }}" > /dev/null && kubectl delete ns "{{ name }} || true"
+    - name: kubectl delete ns "{{ name }}"
+    - onlyif:
+      - kubectl get ns -o=custom-columns=NAME:.metadata.name | grep -v NAME | grep "{{ name }}" > /dev/null
+      {%- if grains.get('noservices') %}
+      - /bin/false
+      {%- endif %}
 
 {%- endif %}