diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index 113dce5b90c33074e90747c68bd347c11b073907..47459d82bf1d9bdfb1b3dcd3b9276e2cefc76177 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -278,8 +278,10 @@ spec:
 
           - name: ozgcloud_alfa_host
             value: {{ include "app.alfaHost" . }}
+          {{- if (.Values.fachstelle).enabled }}
           - name: ozgcloud_fachstelle_host
             value: {{ include "app.fachstelleHost" . }}
+          {{- end }}
           - name: ozgcloud_vorgangManager_serviceAddress
             value: {{ include "app.ozgcloud_vorgangmanager_address" . }}
 
diff --git a/src/test/helm/deployment_fachstelle_host_test.yaml b/src/test/helm/deployment_fachstelle_host_test.yaml
index 1e7335c3b04425ec5b5582725bd7feb41b932a6f..8d728d57640bca3e069c0b29aa36ab1292387fe0 100644
--- a/src/test/helm/deployment_fachstelle_host_test.yaml
+++ b/src/test/helm/deployment_fachstelle_host_test.yaml
@@ -59,3 +59,4 @@ tests:
           path: spec.template.spec.containers[0].env
           content:
             name: ozgcloud_fachstelle_host
+            value: null