diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ae7fb3c..f6da0cab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@
 * [CHANGE] Use default value for num_tokens in ingester configuration #544
 * [BUGFIX] Fix discovering memcached instances #551
 * [BUGFIX] Fix restarting query-schedulers when config changes #559
+* [BUGFIX] Don't configure alertmanager in ruler if alertmanager is disabled #618
 * [ENHANCEMENT] Run overrides-exporter with high availability #557
 * [ENHANCEMENT] Persist subchart #572
 * [ENHANCEMENT] Expose query frontend GRPC port on service for ruler #574
diff --git a/templates/ruler/ruler-dep.yaml b/templates/ruler/ruler-dep.yaml
index 5df0c071..e6c68d6f 100644
--- a/templates/ruler/ruler-dep.yaml
+++ b/templates/ruler/ruler-dep.yaml
@@ -121,7 +121,7 @@ spec:
           args:
             - "-target=ruler"
             - "-config.file=/etc/cortex/cortex.yaml"
-            {{- if not .Values.config.ruler.alertmanager_url }}
+            {{- if and .Values.alertmanager.enabled (not .Values.config.ruler.alertmanager_url) }}
               {{- if .Values.config.ruler.enable_alertmanager_discovery }}
             - "-ruler.alertmanager-url=http://_http-metrics._tcp.{{ template "cortex.alertmanagerFullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}/api/prom/alertmanager/"
               {{- else }}