diff --git a/etc/kayobe/kolla/inventory/group_vars/prometheus-blackbox-exporter b/etc/kayobe/kolla/inventory/group_vars/prometheus-blackbox-exporter
index 9ac96c0261..d50b4eb131 100644
--- a/etc/kayobe/kolla/inventory/group_vars/prometheus-blackbox-exporter
+++ b/etc/kayobe/kolla/inventory/group_vars/prometheus-blackbox-exporter
@@ -111,6 +111,8 @@ prometheus_blackbox_exporter_endpoints_default:
     enabled: "{{ enable_etcd | bool }}"
   - endpoints:
       - "grafana:http_2xx:{{ grafana_public_endpoint }}"
+    enabled: "{{ enable_grafana_external | bool }}"
+  - endpoints:
       - "{{ ('grafana_internal:http_2xx:' + grafana_internal_endpoint) if not kolla_same_external_internal_vip | bool }}"
     enabled: "{{ enable_grafana | bool }}"
   - endpoints:
diff --git a/releasenotes/notes/fix-blackbox-exporter-config-with-no-external-grafana-de1db02c540af6d8.yaml b/releasenotes/notes/fix-blackbox-exporter-config-with-no-external-grafana-de1db02c540af6d8.yaml
new file mode 100644
index 0000000000..bcf30fa2e0
--- /dev/null
+++ b/releasenotes/notes/fix-blackbox-exporter-config-with-no-external-grafana-de1db02c540af6d8.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes an issue where the external Grafana endpoint would be added to
+    Prometheus Blackbox Exporter config, even when ``enable_grafana_external``
+    was disabled.