diff --git a/diagnostics.go b/diagnostics.go
index 08d77a03c..3ad07ed42 100644
--- a/diagnostics.go
+++ b/diagnostics.go
@@ -148,6 +148,13 @@ func (d *DiagnosticsCollector) encode() ([]byte, error) {
 
 // Set adds a key value metric.
 func (d *DiagnosticsCollector) Set(name string, value interface{}) {
+	switch v := value.(type) {
+	case string:
+		if v == "" {
+			// Do not set empty string
+			return
+		}
+	}
 	d.mu.Lock()
 	defer d.mu.Unlock()
 	d.metrics[name] = value