diff --git a/main/app.c b/main/app.c
index d65ff53f7a..c84bd0f54c 100644
--- a/main/app.c
+++ b/main/app.c
@@ -814,8 +814,10 @@ int ast_app_group_set_channel(struct ast_channel *chan, const char *data)
 		}
 	}
 	AST_LIST_TRAVERSE_SAFE_END
-	
-	if ((gi = calloc(1, len))) {
+
+	if (ast_strlen_zero(group)) {
+		/* Enable unsetting the group */
+	} else if ((gi = calloc(1, len))) {
 		gi->chan = chan;
 		gi->group = (char *) gi + sizeof(*gi);
 		strcpy(gi->group, group);