diff --git a/charts/cluster/templates/podmonitor-pooler.yaml b/charts/cluster/templates/podmonitor-pooler.yaml
index c8f1490545..dbf810febd 100644
--- a/charts/cluster/templates/podmonitor-pooler.yaml
+++ b/charts/cluster/templates/podmonitor-pooler.yaml
@@ -1,6 +1,9 @@
 {{- range .Values.poolers }}
+{{- if .monitoring }}
+{{- if .monitoring.enabled }}
+{{- if .monitoring.podMonitor }}
+{{- if .monitoring.podMonitor.enabled }}
 ---
-{{- if and .monitoring .monitoring.enabled .monitoring.podMonitor.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
@@ -35,3 +38,6 @@ spec:
       {{- end }}
 {{- end }}
 {{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/cluster/test/monitoring/01-monitoring_cluster-assert.yaml b/charts/cluster/test/monitoring/01-monitoring_cluster-assert.yaml
index ee4f9ea19a..d2b15356f1 100644
--- a/charts/cluster/test/monitoring/01-monitoring_cluster-assert.yaml
+++ b/charts/cluster/test/monitoring/01-monitoring_cluster-assert.yaml
@@ -17,6 +17,8 @@ spec:
         - name: monitoring-cluster-monitoring
           key: custom-queries
       enablePodMonitor: false
+status:
+  readyInstances: 2
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor