diff --git a/pkg/query-service/model/v3/v3.go b/pkg/query-service/model/v3/v3.go
index 491cfaac88..3b5e042c6d 100644
--- a/pkg/query-service/model/v3/v3.go
+++ b/pkg/query-service/model/v3/v3.go
@@ -446,13 +446,15 @@ func (c *CompositeQuery) EnabledQueries() int {
 }
 
 func (c *CompositeQuery) Sanitize() {
+	if c == nil {
+		return
+	}
 	// remove groupBy for queries with list panel type
 	for _, query := range c.BuilderQueries {
 		if len(query.GroupBy) > 0 && c.PanelType == PanelTypeList {
 			query.GroupBy = []AttributeKey{}
 		}
 	}
-
 }
 
 func (c *CompositeQuery) Validate() error {