diff --git a/core/src/main/java/org/example/teahouse/core/actuator/config/CommonActuatorConfig.java b/core/src/main/java/org/example/teahouse/core/actuator/config/CommonActuatorConfig.java
index 1cbdd9c..70bc680 100644
--- a/core/src/main/java/org/example/teahouse/core/actuator/config/CommonActuatorConfig.java
+++ b/core/src/main/java/org/example/teahouse/core/actuator/config/CommonActuatorConfig.java
@@ -85,7 +85,7 @@ static class DataSourceActuatorConfig {
         ObservationFilter tempoServiceGraphFilter() {
             // TODO: remove this once Tempo is fixed: https://github.com/grafana/tempo/issues/2212
             return context -> {
-                if (context instanceof DataSourceBaseContext dataSourceContext) {
+                if (context instanceof DataSourceBaseContext dataSourceContext && dataSourceContext.getRemoteServiceName() != null) {
                     context.addHighCardinalityKeyValue(KeyValue.of("db.name", dataSourceContext.getRemoteServiceName()));
                 }
                 return context;