diff --git a/lib/pages/common/publish/common_rich_text_pub_page.dart b/lib/pages/common/publish/common_rich_text_pub_page.dart
index 4b57648a5..5eeec8740 100644
--- a/lib/pages/common/publish/common_rich_text_pub_page.dart
+++ b/lib/pages/common/publish/common_rich_text_pub_page.dart
@@ -248,10 +248,12 @@ abstract class CommonRichTextPubPageState<T extends CommonRichTextPubPage>
     if (res != null) {
       if (res is MentionItem) {
         _onInsertUser(res, fromClick);
-      } else if (res is Iterable<MentionItem>) {
+      } else if (res is Set<MentionItem>) {
         for (var e in res) {
+          e.checked = null;
           _onInsertUser(e, fromClick);
         }
+        res.clear();
       }
     }
     controller.restoreChatPanel();
diff --git a/lib/pages/dynamics_mention/view.dart b/lib/pages/dynamics_mention/view.dart
index e4ca63d1e..1531ea085 100644
--- a/lib/pages/dynamics_mention/view.dart
+++ b/lib/pages/dynamics_mention/view.dart
@@ -208,13 +208,8 @@ class _DynMentionPanelState extends State<DynMentionPanel> {
                           _controller.showBtn.value = false;
                           return;
                         }
-                        Get.back(result: _controller.mentionList!.toSet());
-                        for (var e in _controller.mentionList!) {
-                          e.checked = null;
-                        }
-                        _controller
-                          ..mentionList!.clear()
-                          ..showBtn.value = false;
+                        Get.back(result: _controller.mentionList);
+                        _controller.showBtn.value = false;
                       },
                       child: const Icon(Icons.check),
                     ),