diff --git a/internal/statements/statement.go b/internal/statements/statement.go
index f2d77f1a..820fc5ac 100644
--- a/internal/statements/statement.go
+++ b/internal/statements/statement.go
@@ -603,13 +603,13 @@ func (statement *Statement) tbNameNoSchema(table *schemas.Table) string {
 
 // GroupBy generate "Group By keys" statement
 func (statement *Statement) GroupBy(keys string) *Statement {
-	statement.GroupByStr = keys
+	statement.GroupByStr = statement.ReplaceQuote(keys)
 	return statement
 }
 
 // Having generate "Having conditions" statement
 func (statement *Statement) Having(conditions string) *Statement {
-	statement.HavingStr = fmt.Sprintf("HAVING %v", conditions)
+	statement.HavingStr = fmt.Sprintf("HAVING %v", statement.ReplaceQuote(conditions))
 	return statement
 }