diff --git a/include/asterisk/app.h b/include/asterisk/app.h
index 15a2e5dadbef3f5e8ac692188add6b1ca39c8df2..e4eca117d8021a0ff19521131a5cc3d76f832865 100644
--- a/include/asterisk/app.h
+++ b/include/asterisk/app.h
@@ -227,6 +227,9 @@ int ast_app_group_match_get_count(const char *groupmatch, const char *category);
 /*! Discard all group counting for a channel */
 int ast_app_group_discard(struct ast_channel *chan);
 
+/*! Update all group counting for a channel to a new one */
+int ast_app_group_update(struct ast_channel *old, struct ast_channel *new);
+
 /*! Lock the group count list */
 int ast_app_group_list_lock(void);
 
diff --git a/main/app.c b/main/app.c
index 91441f64e3a265c0223f40b9d73b99a9b4bbb829..10b9fea809e0f7cd260d216cd9718bbdff5303d0 100644
--- a/main/app.c
+++ b/main/app.c
@@ -894,6 +894,20 @@ int ast_app_group_match_get_count(const char *groupmatch, const char *category)
 	return count;
 }
 
+int ast_app_group_update(struct ast_channel *old, struct ast_channel *new)
+{
+	struct ast_group_info *gi = NULL;
+
+	AST_LIST_LOCK(&groups);
+	AST_LIST_TRAVERSE(&groups, gi, list) {
+		if (gi->chan == old)
+			gi->chan = new;
+	}
+	AST_LIST_UNLOCK(&groups);
+
+	return 0;
+}
+
 int ast_app_group_discard(struct ast_channel *chan)
 {
 	struct ast_group_info *gi = NULL;
diff --git a/main/channel.c b/main/channel.c
index c92530c347603d47209fc1e4fa3c499743a1dc38..e48042793414f04da10fb0b3d51940ef4b795bef 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -3575,7 +3575,7 @@ int ast_do_masquerade(struct ast_channel *original)
 			original->fds[x] = clone->fds[x];
 	}
 
-	ast_app_group_discard(original);
+	ast_app_group_update(clone, original);
 
 	/* move any whisperer over */
 	ast_channel_whisper_stop(original);