diff --git a/charts/stable/radarr/Chart.yaml b/charts/stable/radarr/Chart.yaml
index 18773819012..d0fd95b4ab6 100644
--- a/charts/stable/radarr/Chart.yaml
+++ b/charts/stable/radarr/Chart.yaml
@@ -22,7 +22,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/radarr
   - https://github.com/Radarr/Radarr
 type: application
-version: 16.1.0
+version: 16.1.1
 annotations:
   truecharts.org/catagories: |
     - media
diff --git a/charts/stable/radarr/templates/common.yaml b/charts/stable/radarr/templates/common.yaml
index 539b471c1d2..3c93f578611 100644
--- a/charts/stable/radarr/templates/common.yaml
+++ b/charts/stable/radarr/templates/common.yaml
@@ -1,6 +1,11 @@
 {{/* Make sure all variables are set properly */}}
-{{- include "tc.v1.common.loader.init" . }}
+{{- include "tc.v1.common.loader.init" . -}}
 
+{{/* Disable [exportarr] if requested */}}
+{{- if not .Values.metrics.main.enabled -}}
+  {{- $_ := set .Values.workload.exportarr "enabled" false -}}
+  {{- $_ := set .Values.service.metrics "enabled" false -}}
+{{- end -}}
 
 {{/* Render the templates */}}
-{{ include "tc.v1.common.loader.apply" . }}
+{{- include "tc.v1.common.loader.apply" . -}}
diff --git a/charts/stable/radarr/values.yaml b/charts/stable/radarr/values.yaml
index a739dc7c302..b8bf9a7be2f 100644
--- a/charts/stable/radarr/values.yaml
+++ b/charts/stable/radarr/values.yaml
@@ -78,7 +78,7 @@ workload:
           env:
             INTERFACE: 0.0.0.0
             PORT: "{{ .Values.service.metrics.ports.metrics.port }}"
-            URL: "http://localhost:{{ .Values.service.main.ports.main.port }}"
+            URL: '{{ printf "http://%v:%v" (include "tc.v1.common.lib.chart.names.fullname" $) .Values.service.main.ports.main.port }}'
             # additional metrics (slow)
             # ENABLE_ADDITIONAL_METRICS: false
             # enable gathering unknown queue items