diff --git a/charts/netdata/templates/child/daemonset.yaml b/charts/netdata/templates/child/daemonset.yaml
index cde76ba5..eabacb97 100644
--- a/charts/netdata/templates/child/daemonset.yaml
+++ b/charts/netdata/templates/child/daemonset.yaml
@@ -93,9 +93,11 @@ spec:
             - name: NETDATA_CLAIM_TOKEN
               value: "{{ .Values.child.claiming.token }}"
             {{- end }}
+            {{- if .Values.child.claiming.rooms }}
             - name: NETDATA_CLAIM_ROOMS
               value: "{{ .Values.child.claiming.rooms }}"
             {{- end }}
+            {{- end }}
             - name: MY_POD_NAME
               valueFrom:
                 fieldRef:
diff --git a/charts/netdata/templates/k8s-state/deployment.yaml b/charts/netdata/templates/k8s-state/deployment.yaml
index fbc1a36e..f0a87c81 100644
--- a/charts/netdata/templates/k8s-state/deployment.yaml
+++ b/charts/netdata/templates/k8s-state/deployment.yaml
@@ -74,9 +74,11 @@ spec:
             - name: NETDATA_CLAIM_TOKEN
               value: "{{ .Values.k8sState.claiming.token }}"
             {{- end }}
+            {{- if .Values.k8sState.claiming.rooms }}
             - name: NETDATA_CLAIM_ROOMS
               value: "{{ .Values.k8sState.claiming.rooms }}"
             {{- end }}
+            {{- end }}
             - name: NETDATA_LISTENER_PORT
               value: '{{ tpl (.Values.k8sState.port | toString) . }}'
             {{- range $key, $value := .Values.k8sState.env }}
diff --git a/charts/netdata/templates/parent/deployment.yaml b/charts/netdata/templates/parent/deployment.yaml
index 8d23cd86..8bcb36b3 100644
--- a/charts/netdata/templates/parent/deployment.yaml
+++ b/charts/netdata/templates/parent/deployment.yaml
@@ -70,9 +70,11 @@ spec:
             - name: NETDATA_CLAIM_TOKEN
               value: "{{ .Values.parent.claiming.token }}"
             {{- end }}
+            {{- if .Values.parent.claiming.rooms }}
             - name: NETDATA_CLAIM_ROOMS
               value: "{{ .Values.parent.claiming.rooms }}"
             {{- end }}
+            {{- end }}
             - name: MY_POD_NAME
               valueFrom:
                 fieldRef: