diff --git a/kernel/events/core.c b/kernel/events/core.c
index 3b9e86108f435..227ada7240295 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -2170,7 +2170,7 @@ static void perf_group_detach(struct perf_event *event)
 		/* Inherit group flags from the previous leader */
 		sibling->group_caps = event->group_caps;
 
-		if (!RB_EMPTY_NODE(&event->group_node)) {
+		if (sibling->attach_state & PERF_ATTACH_CONTEXT) {
 			add_event_to_groups(sibling, event->ctx);
 
 			if (sibling->state == PERF_EVENT_STATE_ACTIVE)