diff --git a/stable/datadog/CHANGELOG.md b/stable/datadog/CHANGELOG.md
index 3690e7a195bf..cf0fba0e3f37 100644
--- a/stable/datadog/CHANGELOG.md
+++ b/stable/datadog/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Datadog changelog
 
+## 2.3.28
+
+* fix daemonset template generation if `datadog.securityContext` is set to `nil`
+
 ## 2.3.27
 
 * add systemProbe.collectDNSStats option
diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml
index f9b861f438b3..5f1a8db6e3c2 100644
--- a/stable/datadog/Chart.yaml
+++ b/stable/datadog/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: datadog
-version: 2.3.27
+version: 2.3.28
 appVersion: "7"
 description: Datadog Agent
 keywords:
diff --git a/stable/datadog/templates/daemonset.yaml b/stable/datadog/templates/daemonset.yaml
index 7a44fef57417..d133ee3a6721 100644
--- a/stable/datadog/templates/daemonset.yaml
+++ b/stable/datadog/templates/daemonset.yaml
@@ -41,7 +41,7 @@ spec:
 {{ toYaml .Values.agents.podAnnotations | indent 8 }}
       {{- end }}
     spec:
-      {{- if and .Values.datadog.securityContext .Values.datadog.securityContext.seLinuxOptions }}
+      {{- if (.Values.datadog.securityContext) and .Values.datadog.securityContext.seLinuxOptions }}
       securityContext:
         seLinuxOptions:
 {{ toYaml .Values.datadog.securityContext.seLinuxOptions | indent 10 }}