diff --git a/omec/omec-control-plane/templates/statefulset-hss.yaml b/omec/omec-control-plane/templates/statefulset-hss.yaml
index 8b32515..432dadb 100644
--- a/omec/omec-control-plane/templates/statefulset-hss.yaml
+++ b/omec/omec-control-plane/templates/statefulset-hss.yaml
@@ -8,6 +8,7 @@
 Declare variables to be passed into your templates.
 */}}
 
+{{- if .Values.config.hss.deploy }}
 {{ tuple "hss" . | include "omec-control-plane.service_account" }}
 ---
 apiVersion: apps/v1
@@ -106,3 +107,4 @@
         hostPath:
           path: {{ .Values.config.coreDump.path }}
     {{- end }}
+{{- end }}