diff --git a/packages/apps/kubernetes/templates/helmreleases/hami.yaml b/packages/apps/kubernetes/templates/helmreleases/hami.yaml
index 1f7a5358..f1538c7c 100644
--- a/packages/apps/kubernetes/templates/helmreleases/hami.yaml
+++ b/packages/apps/kubernetes/templates/helmreleases/hami.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.addons.hami.enabled }}
+{{- if and .Values.addons.hami.enabled .Values._namespace.etcd }}
 {{- if not .Values.addons.gpuOperator.enabled }}
 {{- fail "addons.hami requires addons.gpuOperator to be enabled" }}
 {{- end }}
diff --git a/packages/apps/kubernetes/tests/hami_test.yaml b/packages/apps/kubernetes/tests/hami_test.yaml
index bdbe990f..27f7c75b 100644
--- a/packages/apps/kubernetes/tests/hami_test.yaml
+++ b/packages/apps/kubernetes/tests/hami_test.yaml
@@ -1,6 +1,8 @@
 suite: HAMi HelmRelease tests
 templates:
   - templates/helmreleases/hami.yaml
+values:
+  - values-ci.yaml
 tests:
   - it: should not render when hami is disabled
     set: