diff --git a/dal/db_query/queries.sql b/dal/db_query/queries.sql
index 9cebbf8..81f565e 100644
--- a/dal/db_query/queries.sql
+++ b/dal/db_query/queries.sql
@@ -313,7 +313,7 @@ SELECT DISTINCT on (question_id) id, content, quiz_id, question_id, fingerprint,
     SELECT session FROM answer WHERE answer.id = $1) ORDER BY question_id, created_at DESC;
 
 -- name: GetQuestions :many
-SELECT id, quiz_id, title, description, questiontype, required, deleted, page, content, version, parent_ids, created_at, updated_at FROM question WHERE quiz_id = $1 AND deleted = FALSE;
+SELECT id, quiz_id, title, description, questiontype, required, deleted, page, content, version, parent_ids, created_at, updated_at FROM question WHERE quiz_id = $1 AND deleted = FALSE ORDER BY page ASC;
 
 -- name: SoftDeleteResultByID :exec
 UPDATE answer SET deleted = TRUE WHERE id = $1 AND deleted = FALSE;
diff --git a/dal/sqlcgen/queries.sql.go b/dal/sqlcgen/queries.sql.go
index 9dac75c..7256598 100644
--- a/dal/sqlcgen/queries.sql.go
+++ b/dal/sqlcgen/queries.sql.go
@@ -1118,7 +1118,7 @@ func (q *Queries) GetQuestionTitle(ctx context.Context, id int64) (GetQuestionTi
 }
 
 const getQuestions = `-- name: GetQuestions :many
-SELECT id, quiz_id, title, description, questiontype, required, deleted, page, content, version, parent_ids, created_at, updated_at FROM question WHERE quiz_id = $1 AND deleted = FALSE
+SELECT id, quiz_id, title, description, questiontype, required, deleted, page, content, version, parent_ids, created_at, updated_at FROM question WHERE quiz_id = $1 AND deleted = FALSE ORDER BY page ASC
 `
 
 func (q *Queries) GetQuestions(ctx context.Context, quizID int64) ([]Question, error) {
diff --git a/repository/result/result.go b/repository/result/result.go
index 1a8ecc5..e71aea0 100644
--- a/repository/result/result.go
+++ b/repository/result/result.go
@@ -141,7 +141,7 @@ func (r *ResultRepository) GetQuizResultsCSV(ctx context.Context, quizID uint64,
 		WHERE a2.session = a.session AND a2.result = TRUE AND a2.quiz_id = a.quiz_id
 	)`
 
-	mainQuery += ` ORDER BY a.question_id, a.session, a.created_at DESC, a.result DESC`
+	mainQuery += ` ORDER BY a.session, a.question_id ASC, a.created_at DESC, a.result DESC`
 
 	rows, err := r.pool.QueryContext(ctx, mainQuery, queryParams...)
 	if err != nil {