diff --git a/src/telemetry/Counter.h b/src/telemetry/Counter.h
index 812fe8ad7f..ee3f7a6795 100644
--- a/src/telemetry/Counter.h
+++ b/src/telemetry/Counter.h
@@ -143,8 +143,11 @@ public:
         std::vector<RecordValPtr> records;
         for ( const auto& ctr : counters ) {
             auto label_values_vec = make_intrusive<VectorVal>(string_vec_type);
-            for ( const auto& [label_key, label] : ctr->Labels() )
-                label_values_vec->Append(make_intrusive<StringVal>(label));
+            for ( const auto& [label_key, label] : ctr->Labels() ) {
+                // We don't include the endpoint key/value unless it's a prometheus request
+                if ( label_key != "endpoint" )
+                    label_values_vec->Append(make_intrusive<StringVal>(label));
+            }
 
             auto r = make_intrusive<zeek::RecordVal>(metric_record_type);
             r->Assign(labels_idx, label_values_vec);
diff --git a/src/telemetry/Gauge.h b/src/telemetry/Gauge.h
index 083df5230f..76ed69f161 100644
--- a/src/telemetry/Gauge.h
+++ b/src/telemetry/Gauge.h
@@ -167,8 +167,11 @@ public:
         std::vector<RecordValPtr> records;
         for ( const auto& g : gauges ) {
             auto label_values_vec = make_intrusive<VectorVal>(string_vec_type);
-            for ( const auto& [label_key, label] : g->Labels() )
-                label_values_vec->Append(make_intrusive<StringVal>(label));
+            for ( const auto& [label_key, label] : g->Labels() ) {
+                // We don't include the endpoint key/value unless it's a prometheus request
+                if ( label_key != "endpoint" )
+                    label_values_vec->Append(make_intrusive<StringVal>(label));
+            }
 
             auto r = make_intrusive<zeek::RecordVal>(metric_record_type);
             r->Assign(labels_idx, label_values_vec);
diff --git a/src/telemetry/Histogram.h b/src/telemetry/Histogram.h
index 846a871fcc..6ac8d1712c 100644
--- a/src/telemetry/Histogram.h
+++ b/src/telemetry/Histogram.h
@@ -144,8 +144,11 @@ public:
         std::vector<RecordValPtr> records;
         for ( const auto& h : histograms ) {
             auto label_values_vec = make_intrusive<VectorVal>(string_vec_type);
-            for ( const auto& [label_key, label] : h->Labels() )
-                label_values_vec->Append(make_intrusive<StringVal>(label));
+            for ( const auto& [label_key, label] : h->Labels() ) {
+                // We don't include the endpoint key/value unless it's a prometheus request
+                if ( label_key != "endpoint" )
+                    label_values_vec->Append(make_intrusive<StringVal>(label));
+            }
 
             auto r = make_intrusive<zeek::RecordVal>(histogram_metric_type);
             r->Assign(labels_idx, label_values_vec);
diff --git a/src/telemetry/MetricFamily.cc b/src/telemetry/MetricFamily.cc
index 107053ece2..db4d488979 100644
--- a/src/telemetry/MetricFamily.cc
+++ b/src/telemetry/MetricFamily.cc
@@ -42,7 +42,6 @@ RecordValPtr MetricFamily::GetMetricOptsRecord() const {
     record_val->Assign(is_total_idx, val_mgr->Bool(is_sum));
 
     auto label_names_vec = make_intrusive<zeek::VectorVal>(string_vec_type);
-    label_names_vec->Append(make_intrusive<StringVal>("endpoint"));
     for ( const auto& lbl : labels )
         label_names_vec->Append(make_intrusive<StringVal>(lbl));