diff --git a/deployment/helm/node-feature-discovery/templates/master.yaml b/deployment/helm/node-feature-discovery/templates/master.yaml
index c2a4ff534..e77ca136c 100644
--- a/deployment/helm/node-feature-discovery/templates/master.yaml
+++ b/deployment/helm/node-feature-discovery/templates/master.yaml
@@ -86,12 +86,11 @@ spec:
             - "-instance={{ .Values.master.instance }}"
             {{- end }}
             - "-port={{ .Values.master.port | default "8080" }}"
-            {{- if .Values.enableNodeFeatureApi }}
-            - "-enable-nodefeature-api"
-            {{- if  gt (int .Values.master.replicaCount) 1 }}
+            {{- if not .Values.enableNodeFeatureApi }}
+            - "-enable-nodefeature-api=false"
+            {{- else if gt (int .Values.master.replicaCount) 1 }}
             - "-enable-leader-election"
             {{- end }}
-            {{- end }}
             {{- if .Values.master.extraLabelNs | empty | not }}
             - "-extra-label-ns={{- join "," .Values.master.extraLabelNs }}"
             {{- end }}
diff --git a/deployment/helm/node-feature-discovery/templates/worker.yaml b/deployment/helm/node-feature-discovery/templates/worker.yaml
index b05ecb2f9..0e56eb5d1 100644
--- a/deployment/helm/node-feature-discovery/templates/worker.yaml
+++ b/deployment/helm/node-feature-discovery/templates/worker.yaml
@@ -50,8 +50,8 @@ spec:
         - "nfd-worker"
         args:
         - "-server={{ include "node-feature-discovery.fullname" . }}-master:{{ .Values.master.service.port }}"
-        {{- if .Values.enableNodeFeatureApi }}
-        - "-enable-nodefeature-api"
+        {{- if not .Values.enableNodeFeatureApi }}
+        - "-enable-nodefeature-api=false"
         {{- end }}
 {{- if .Values.tls.enable }}
         - "-ca-file=/etc/kubernetes/node-feature-discovery/certs/ca.crt"