diff --git a/charts/gitops-runtime/templates/_helpers.tpl b/charts/gitops-runtime/templates/_helpers.tpl
index d08038632..5e74736be 100644
--- a/charts/gitops-runtime/templates/_helpers.tpl
+++ b/charts/gitops-runtime/templates/_helpers.tpl
@@ -291,7 +291,7 @@ Determine argocd redis url
 {{- else }}
   {{- printf "" }}
 {{- end }}
-{{- end}}
+{{- end }}
 
 {{/*
 Determine argo worklofws server name
diff --git a/charts/gitops-runtime/templates/argo-gateway/configmap.yaml b/charts/gitops-runtime/templates/argo-gateway/configmap.yaml
index 11a6406a9..fdec6fe5c 100644
--- a/charts/gitops-runtime/templates/argo-gateway/configmap.yaml
+++ b/charts/gitops-runtime/templates/argo-gateway/configmap.yaml
@@ -1,7 +1,10 @@
 {{- define "argo-gateway.resources.configmap.defaults" }}
 argocd.server: {{ include "codefresh-gitops-runtime.argocd.server.no-protocol-url" . }}
 repo.server: {{ include "codefresh-gitops-runtime.argocd.reposerver.url" . }}
-redis.server: {{ include "codefresh-gitops-runtime.argocd.redis.url" . }}
+  {{- $redisServer := (include "codefresh-gitops-runtime.argocd.redis.url" .) }}
+  {{- if $redisServer }}
+redis.server: {{ $redisServer }}
+  {{- end }}
 {{- end }}
 
 {{- $defaultConfig := (include "argo-gateway.resources.configmap.defaults" . | fromYaml ) }}
diff --git a/charts/gitops-runtime/templates/event-reporters/cluster-event-reporter/configmap.yaml b/charts/gitops-runtime/templates/event-reporters/cluster-event-reporter/configmap.yaml
index 0a740a502..fdd224e9b 100644
--- a/charts/gitops-runtime/templates/event-reporters/cluster-event-reporter/configmap.yaml
+++ b/charts/gitops-runtime/templates/event-reporters/cluster-event-reporter/configmap.yaml
@@ -1,7 +1,10 @@
 {{- define "cluster-event-reporter.resources.configmap.defaults" }}
 argocd.server: {{ include "codefresh-gitops-runtime.argocd.server.no-protocol-url" . }}
-redis.server: {{ include "codefresh-gitops-runtime.argocd.redis.url" . }}
 repo.server: {{ include "codefresh-gitops-runtime.argocd.reposerver.url" . }}
+  {{- $redisServer := (include "codefresh-gitops-runtime.argocd.redis.url" .) }}
+  {{- if $redisServer }}
+redis.server: {{ $redisServer }}
+  {{- end }}
 argo-gateway.server: http://argo-gateway
 resource.threadiness: '100'
 app.queue.size: '1000'
diff --git a/charts/gitops-runtime/templates/event-reporters/runtime-event-reporter/configmap.yaml b/charts/gitops-runtime/templates/event-reporters/runtime-event-reporter/configmap.yaml
index 93316c77d..ec58366d4 100644
--- a/charts/gitops-runtime/templates/event-reporters/runtime-event-reporter/configmap.yaml
+++ b/charts/gitops-runtime/templates/event-reporters/runtime-event-reporter/configmap.yaml
@@ -1,7 +1,10 @@
 {{- define "runtime-event-reporter.resources.configmap.defaults"}}
 argocd.server: {{ include "codefresh-gitops-runtime.argocd.server.no-protocol-url" . }}
-redis.server: {{ include "codefresh-gitops-runtime.argocd.redis.url" . }}
 repo.server: {{ include "codefresh-gitops-runtime.argocd.reposerver.url" . }}
+  {{- $redisServer := (include "codefresh-gitops-runtime.argocd.redis.url" .) }}
+  {{- if $redisServer }}
+redis.server: {{ $redisServer }}
+  {{- end }}
 argo-gateway.server: http://argo-gateway
 resource.threadiness: '10'
 app.queue.size: '1000'
diff --git a/charts/gitops-runtime/tests/argo-api-gateway_test.yaml b/charts/gitops-runtime/tests/argo-api-gateway_test.yaml
index 42548ff93..5b9f6412e 100644
--- a/charts/gitops-runtime/tests/argo-api-gateway_test.yaml
+++ b/charts/gitops-runtime/tests/argo-api-gateway_test.yaml
@@ -12,9 +12,8 @@ tests:
       - equal:
           path: data["argocd.server"]
           value: argo-cd-server:80
-      - equal:
+      - notExists:
           path: data["redis.server"]
-          value: null
       - equal:
           path: data["repo.server"]
           value: argo-cd-repo-server:8081
diff --git a/charts/gitops-runtime/tests/event-reporters_test.yaml b/charts/gitops-runtime/tests/event-reporters_test.yaml
index 05f8a85c1..33217db9a 100644
--- a/charts/gitops-runtime/tests/event-reporters_test.yaml
+++ b/charts/gitops-runtime/tests/event-reporters_test.yaml
@@ -39,9 +39,8 @@ tests:
       - equal:
           path: data["argocd.server"]
           value: argo-cd-server:80
-      - equal:
+      - notExists:
           path: data["redis.server"]
-          value: null
       - equal:
           path: data["repo.server"]
           value: argo-cd-repo-server:8081