diff --git a/public/script.js b/public/script.js
index fcebc9ba3..0dd1a66b9 100644
--- a/public/script.js
+++ b/public/script.js
@@ -1541,7 +1541,7 @@ class StreamingProcessor {
     }
 }
 
-async function Generate(type, { automatic_trigger, force_name2, resolve, reject, quiet_prompt } = {}) {
+async function Generate(type, { automatic_trigger, force_name2, resolve, reject, quiet_prompt, force_chid } = {}) {
     //console.log('Generate entered');
     setGenerationProgress(0);
     tokens_already_generated = 0;
@@ -1577,7 +1577,7 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
     }
 
     if (selected_group && !is_group_generating) {
-        generateGroupWrapper(false, type, null, { resolve, reject, quiet_prompt });
+        generateGroupWrapper(false, type, { resolve, reject, quiet_prompt, force_chid });
         return;
     }
 
diff --git a/public/scripts/group-chats.js b/public/scripts/group-chats.js
index b8f24c444..273f551d2 100644
--- a/public/scripts/group-chats.js
+++ b/public/scripts/group-chats.js
@@ -377,7 +377,7 @@ function getGroupAvatar(group) {
 }
 
 
-async function generateGroupWrapper(by_auto_mode, type = null, force_chid = null, params = {}) {
+async function generateGroupWrapper(by_auto_mode, type = null, params = {}) {
     if (online_status === "no_connection") {
         is_group_generating = false;
         setSendButtonState(false);
@@ -440,8 +440,8 @@ async function generateGroupWrapper(by_auto_mode, type = null, force_chid = null
         const activationStrategy = Number(group.activation_strategy ?? group_activation_strategy.NATURAL);
         let activatedMembers = [];
 
-        if (typeof force_chid == 'number') {
-            activatedMembers = [force_chid];
+        if (params && typeof params.force_chid == 'number') {
+            activatedMembers = [params.force_chid];
         } else if (type === "quiet") {
             activatedMembers = activateSwipe(group.members);
 
@@ -986,7 +986,7 @@ function select_group_chats(groupId, skipAnimation) {
         if (action === 'speak') {
             const chid = Number(member.attr('chid'));
             if (Number.isInteger(chid)) {
-                generateGroupWrapper(false, null, chid);
+                Generate('normal', { force_chid: chid });
             }
         }