diff --git a/agent/serviceinfobroker/service_info_broker.go b/agent/serviceinfobroker/service_info_broker.go
index f53a6999653..fd280d616c7 100644
--- a/agent/serviceinfobroker/service_info_broker.go
+++ b/agent/serviceinfobroker/service_info_broker.go
@@ -226,7 +226,8 @@ func (sib *ServiceInfoBroker) getPostgreSQLInfo(ctx context.Context, dsn string,
 	res.Version = version
 
 	var databaseCount int32
-	if err = db.QueryRowContext(ctx, "SELECT /* agent='serviceinfobroker' */ count(datname) FROM pg_database WHERE datallowconn = true AND datistemplate = false AND datname != current_database()").Scan(&databaseCount); err != nil {
+	databaseCountQuery := "SELECT /* agent='serviceinfobroker' */ count(datname) FROM pg_database WHERE datallowconn = true AND datistemplate = false AND datname != current_database()" //nolint:lll
+	if err = db.QueryRowContext(ctx, databaseCountQuery).Scan(&databaseCount); err != nil {
 		res.Error = err.Error()
 	}
 	res.DatabaseCount = databaseCount
diff --git a/managed/models/agent_helpers.go b/managed/models/agent_helpers.go
index 379284b4524..afe22d18650 100644
--- a/managed/models/agent_helpers.go
+++ b/managed/models/agent_helpers.go
@@ -63,7 +63,7 @@ type PostgreSQLExtendedOptionsParams interface {
 
 // PostgreSQLOptionsFromRequest creates PostgreSQLOptions object from request.
 func PostgreSQLOptionsFromRequest(params PostgreSQLOptionsParams) *PostgreSQLOptions {
-	res := new(PostgreSQLOptions)
+	res := &PostgreSQLOptions{}
 	if params.GetTlsCa() != "" || params.GetTlsCert() != "" || params.GetTlsKey() != "" {
 		res.SSLCa = params.GetTlsCa()
 		res.SSLCert = params.GetTlsCert()