diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c
index 0c9a596692a5e458b728c4882f3a04731c2997bf..c84c6f7b59fd5e68dde741d7d9c0d89edf1d3d7b 100644
--- a/kernel/sched/psi.c
+++ b/kernel/sched/psi.c
@@ -757,9 +757,13 @@ static struct psi_group *iterate_groups(struct task_struct *task, void **iter)
 			cgroup = task->cgroups->dfl_cgrp;
 		else {
 #ifdef CONFIG_CGROUP_CPUACCT
-			rcu_read_lock();
-			cgroup = task_cgroup(task, cpuacct_cgrp_id);
-			rcu_read_unlock();
+			if (!cgroup_subsys_on_dfl(cpuacct_cgrp_subsys)) {
+				rcu_read_lock();
+				cgroup = task_cgroup(task, cpuacct_cgrp_id);
+				rcu_read_unlock();
+			} else {
+				cgroup = task->cgroups->dfl_cgrp;
+			}
 #else
 			cgroup = NULL;
 #endif