diff --git a/charts/library/common-test/tests/cnpg/cluster_metadata_test.yaml b/charts/library/common-test/tests/cnpg/cluster_metadata_test.yaml
index 9ef0027c7de..f69a6ac308c 100644
--- a/charts/library/common-test/tests/cnpg/cluster_metadata_test.yaml
+++ b/charts/library/common-test/tests/cnpg/cluster_metadata_test.yaml
@@ -153,3 +153,17 @@ tests:
         equal:
           path: metadata.namespace
           value: local-namespace
+
+  - it: should pass with cnpg with skipEmptyWalArchiveCheck annotation
+    set:
+      cnpg:
+        my-pg:
+          enabled: true
+          user: test-user
+          database: test-db
+          password: test-password
+    asserts:
+      - documentIndex: *clusterDoc
+        equal:
+          path: metadata.annotations["cnpg.io/skipEmptyWalArchiveCheck"]
+          value: "enabled"
diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml
index d551a5b5f4a..c8d46609025 100644
--- a/charts/library/common/Chart.yaml
+++ b/charts/library/common/Chart.yaml
@@ -48,5 +48,5 @@ sources:
   - https://hub.docker.com/_/
   - https://hub.docker.com/r/mikefarah/yq
 type: library
-version: 28.12.8
+version: 28.12.9
 
diff --git a/charts/library/common/templates/class/cnpg/_cluster.tpl b/charts/library/common/templates/class/cnpg/_cluster.tpl
index ffc1b6ef6b0..2c3dfe27ad3 100644
--- a/charts/library/common/templates/class/cnpg/_cluster.tpl
+++ b/charts/library/common/templates/class/cnpg/_cluster.tpl
@@ -176,7 +176,9 @@ metadata:
   annotations:
     cnpg.io/hibernation: {{ $hibernation | quote }}
     checksum/secrets: {{ toJson $rootCtx.Values.secret | sha256sum }}
-    cnpg.io/skipEmptyWalArchiveCheck: $skipEmptyWalArchiveCheck
+    {{- if $skipEmptyWalArchiveCheck }}
+    cnpg.io/skipEmptyWalArchiveCheck: "enabled"
+    {{- end }}
   {{- $annotations := (mustMerge $clusterAnnotations (include "tc.v1.common.lib.metadata.allAnnotations" $rootCtx | fromYaml)) -}}
   {{- with (include "tc.v1.common.lib.metadata.render" (dict "rootCtx" $rootCtx "annotations" $annotations) | trim) }}
     {{- . | nindent 4 }}