diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a00de4c..798bc218 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/lang/zh-CN/
 
 - 留言板支持多行选择
 
+### Fixed
+
+- 修复话题排序问题
+
 ## [0.9.4] - 2023-02-05
 
 ### Added
diff --git a/lib/board/graphql/queries/topics.dart b/lib/board/graphql/queries/topics.dart
index 48229823..8242815e 100644
--- a/lib/board/graphql/queries/topics.dart
+++ b/lib/board/graphql/queries/topics.dart
@@ -1,6 +1,6 @@
 const String topicsQuery = r'''
 query topics($after: String) {
-  topics(after: $after, order: {activeAt: DESC}) {
+  topics(after: $after, order: {isPinned: DESC, isClosed: ASC, activeAt: DESC}) {
     pageInfo {
       hasNextPage
       endCursor