diff --git a/i18n/en.json b/i18n/en.json
index 48aee99c5d..6b60f6096a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -5722,6 +5722,10 @@
     "id": "store.sql.convert_string_map",
     "translation": "FromDb: Unable to convert StringMap to *string"
   },
+  {
+    "id": "store.sql_audit.app_error",
+    "translation": "Failed to build query."
+  },
   {
     "id": "store.sql_audit.get.finding.app_error",
     "translation": "We encountered an error finding the audits."
diff --git a/store/sqlstore/audit_store.go b/store/sqlstore/audit_store.go
index c8f6dbddb2..921732449f 100644
--- a/store/sqlstore/audit_store.go
+++ b/store/sqlstore/audit_store.go
@@ -6,6 +6,8 @@ package sqlstore
 import (
 	"net/http"
 
+	sq "github.com/Masterminds/squirrel"
+
 	"github.com/mattermost/mattermost-server/v5/model"
 	"github.com/mattermost/mattermost-server/v5/store"
 )
@@ -49,16 +51,24 @@ func (s SqlAuditStore) Get(user_id string, offset int, limit int) (model.Audits,
 		return nil, model.NewAppError("SqlAuditStore.Get", "store.sql_audit.get.limit.app_error", nil, "user_id="+user_id, http.StatusBadRequest)
 	}
 
-	query := "SELECT * FROM Audits"
+	query := s.getQueryBuilder().
+		Select("*").
+		From("Audits").
+		OrderBy("CreateAt DESC").
+		Limit(uint64(limit)).
+		Offset(uint64(offset))
 
 	if len(user_id) != 0 {
-		query += " WHERE UserId = :user_id"
+		query = query.Where(sq.Eq{"UserId": user_id})
 	}
 
-	query += " ORDER BY CreateAt DESC LIMIT :limit OFFSET :offset"
+	queryString, args, err := query.ToSql()
+	if err != nil {
+		return nil, model.NewAppError("SqlAuditStore.Get", "store.sql_audit.app_error", nil, err.Error(), http.StatusInternalServerError)
+	}
 
 	var audits model.Audits
-	if _, err := s.GetReplica().Select(&audits, query, map[string]interface{}{"user_id": user_id, "limit": limit, "offset": offset}); err != nil {
+	if _, err := s.GetReplica().Select(&audits, queryString, args...); err != nil {
 		return nil, model.NewAppError("SqlAuditStore.Get", "store.sql_audit.get.finding.app_error", nil, "user_id="+user_id, http.StatusInternalServerError)
 	}
 	return audits, nil