diff --git a/helm-charts/templates/data-plane/gateway-components/log-conf.yaml b/helm-charts/templates/data-plane/gateway-components/log-conf.yaml
index b3b76d7bf4..38c9f5c7d2 100644
--- a/helm-charts/templates/data-plane/gateway-components/log-conf.yaml
+++ b/helm-charts/templates/data-plane/gateway-components/log-conf.yaml
@@ -21,7 +21,7 @@ data:
       port = 18006
     {{ end}}  
 
-    {{- if .Values.wso2.apk.cp.controlplane }}
+    {{- if and .Values.wso2.apk.cp .Values.wso2.apk.cp.controlplane }}
     [adapter.controlplane]
       enableApiPropagation = {{ .Values.wso2.apk.cp.controlplane.enableApiPropagation | default false }}
       host = "{{ .Values.wso2.apk.cp.controlplane.host | default "apim-apk-agent-service.apk.svc.cluster.local" }}"