diff --git a/pkg/tsdb/elasticsearch/client/models.go b/pkg/tsdb/elasticsearch/client/models.go
index 2d9839dfd53..2f4f5dcd162 100644
--- a/pkg/tsdb/elasticsearch/client/models.go
+++ b/pkg/tsdb/elasticsearch/client/models.go
@@ -278,7 +278,9 @@ func (a *MetricAggregation) MarshalJSON() ([]byte, error) {
 	}
 
 	for k, v := range a.Settings {
-		root[k] = v
+		if k != "" && v != nil {
+			root[k] = v
+		}
 	}
 
 	return json.Marshal(root)
@@ -297,7 +299,9 @@ func (a *PipelineAggregation) MarshalJSON() ([]byte, error) {
 	}
 
 	for k, v := range a.Settings {
-		root[k] = v
+		if k != "" && v != nil {
+			root[k] = v
+		}
 	}
 
 	return json.Marshal(root)