diff --git a/helm-chart/eoapi/templates/services/nginx-doc-server.yaml b/helm-chart/eoapi/templates/services/nginx-doc-server.yaml
index ac8d9c99..1568a20c 100644
--- a/helm-chart/eoapi/templates/services/nginx-doc-server.yaml
+++ b/helm-chart/eoapi/templates/services/nginx-doc-server.yaml
@@ -46,6 +46,7 @@ spec:
       - name: doc-html-{{ .Release.Name }}
         configMap:
           name: nginx-root-html-{{ .Release.Name }}
+      {{- if .Values.docServer.settings }}
       {{- with .Values.docServer.settings.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
@@ -54,6 +55,7 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- end }}
 ---
 apiVersion: v1
 kind: Service