diff --git a/sched/group/group_create.c b/sched/group/group_create.c
index ed23dfc966b..71e288c7bd8 100644
--- a/sched/group/group_create.c
+++ b/sched/group/group_create.c
@@ -287,7 +287,12 @@ errout_with_group:
     }
 #endif
 
-  kmm_free(group);
+  if (group != &g_kthread_group)
+    {
+      kmm_free(group);
+    }
+
+  tcb->group = NULL;
   return ret;
 }