diff --git a/apps/chat.js b/apps/chat.js
index 58ea9b1..b407296 100644
--- a/apps/chat.js
+++ b/apps/chat.js
@@ -2142,7 +2142,7 @@ export class chatgpt extends plugin {
             opt.groupId = e.group_id
             opt.qq = e.sender.user_id
             opt.nickname = e.sender.card
-            opt.groupName = e.group.name
+            opt.groupName = e.group.name || e.group_name
             opt.botName = e.isGroup ? (e.group.pickMember(getUin(e)).card || e.group.pickMember(getUin(e)).nickname) : e.bot.nickname
             let master = (await getMasterQQ())[0]
             if (master && e.group) {
diff --git a/utils/chat.js b/utils/chat.js
index 3263c6c..31102dd 100644
--- a/utils/chat.js
+++ b/utils/chat.js
@@ -1,6 +1,6 @@
 export async function getChatHistoryGroup (e, num) {
   if (e.adapter === 'shamrock') {
-    return await e.group.getChatHistory(0, num)
+    return await e.group.getChatHistory(0, num, false)
   } else {
     let latestChats = await e.group.getChatHistory(0, 1)
     if (latestChats.length > 0) {