diff --git a/pkg/coredata/control_filter.go b/pkg/coredata/control_filter.go
index 66f91287a..99c54b74c 100644
--- a/pkg/coredata/control_filter.go
+++ b/pkg/coredata/control_filter.go
@@ -31,9 +31,13 @@ func NewControlFilter(query *string) *ControlFilter {
 }
 
 func (f *ControlFilter) SQLArguments() pgx.NamedArgs {
-	return pgx.NamedArgs{
-		"query": f.query,
+	args := pgx.NamedArgs{}
+
+	if f.query != nil {
+		args["query"] = *f.query
 	}
+
+	return args
 }
 
 func (f *ControlFilter) SQLFragment() string {