diff --git a/cmd-queue.c b/cmd-queue.c
index c343a212..0cfa57fe 100644
--- a/cmd-queue.c
+++ b/cmd-queue.c
@@ -181,6 +181,8 @@ cmdq_remove_group(struct cmdq_item *item)
 {
 	struct cmdq_item	*this, *next;
 
+	if (item->group == 0)
+		return;
 	this = TAILQ_NEXT(item, entry);
 	while (this != NULL) {
 		next = TAILQ_NEXT(this, entry);