diff --git a/charts/cluster/templates/cluster.yaml b/charts/cluster/templates/cluster.yaml
index ca7609a38..c1879cfef 100644
--- a/charts/cluster/templates/cluster.yaml
+++ b/charts/cluster/templates/cluster.yaml
@@ -56,7 +56,9 @@ spec:
       {{- if eq .Values.type "timescaledb" }}
       - timescaledb
       {{- end }}
-      {{- toYaml .Values.cluster.postgresql.shared_preload_libraries | nindent 6 }}
+      {{- with .Values.cluster.postgresql.shared_preload_libraries }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
     {{- with .Values.cluster.postgresql }}
     parameters:
       {{- toYaml .parameters | nindent 6 }}
diff --git a/charts/cluster/test/timescale-minio-backup-restore/chainsaw-test.yaml b/charts/cluster/test/timescale-minio-backup-restore/chainsaw-test.yaml
index e0a8ee401..496153398 100644
--- a/charts/cluster/test/timescale-minio-backup-restore/chainsaw-test.yaml
+++ b/charts/cluster/test/timescale-minio-backup-restore/chainsaw-test.yaml
@@ -34,6 +34,8 @@ spec:
         - describe:
             apiVersion: postgresql.cnpg.io/v1
             kind: Cluster
+        - podLogs:
+            selector: cnpg.io/cluster=timescale-cluster
     - name: Verify timescale extensions are installed
       timeouts:
         apply: 1s
@@ -101,6 +103,12 @@ spec:
                 recovery-backup-pitr ../../
         - assert:
             file: ./07-recovery_backup_pitr_cluster-assert.yaml
+      catch:
+        - describe:
+            apiVersion: postgresql.cnpg.io/v1
+            kind: Cluster
+        - podLogs:
+            selector: cnpg.io/cluster=recovery-backup-pitr-cluster
     - name: Verify the pre-backup data on the recovery cluster exists but not the post-backup data
       try:
         - apply: