diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md
index 2c78bea424eb4..45809c0f4597f 100644
--- a/production/helm/loki/CHANGELOG.md
+++ b/production/helm/loki/CHANGELOG.md
@@ -13,6 +13,8 @@ Entries should include a reference to the pull request that introduced the chang
 
 [//]: # (<AUTOMATED_UPDATES_LOCATOR> : do not remove this line. This locator is used by the CI pipeline to automatically create a changelog entry for each new Loki release. Add other chart versions and respective changelog entries bellow this line.)
 
+- [BUGFIX] Disables the Helm test pod when `test.enabled=false`.
+
 ## 6.23.0
 
 - [CHANGE] Changed version of Grafana Loki to 3.3.1
diff --git a/production/helm/loki/templates/tests/test-canary.yaml b/production/helm/loki/templates/tests/test-canary.yaml
index 9384865b7b07d..4d992284a16a5 100644
--- a/production/helm/loki/templates/tests/test-canary.yaml
+++ b/production/helm/loki/templates/tests/test-canary.yaml
@@ -1,5 +1,5 @@
 {{- with .Values.test }}
-{{- if $.Values.lokiCanary.enabled }}
+{{- if (and .enabled $.Values.lokiCanary.enabled) }}
 ---
 apiVersion: v1
 kind: Pod