diff --git a/kernel/fork.c b/kernel/fork.c
index 97a89ab68a26290a45ec3d76ffe0ec99376b1189..a8a30a21799a6cb085958e53f05ae8428fb95245 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1192,6 +1192,10 @@ static struct task_struct *dup_task_struct(struct task_struct *orig, int node)
 	tsk->prefer_cpus = NULL;
 #endif
 
+#ifdef CONFIG_QOS_SCHED_SMART_GRID
+	tsk->grid_qos = NULL;
+#endif
+
 	setup_thread_stack(tsk, orig);
 	clear_user_return_notifier(tsk);
 	clear_tsk_need_resched(tsk);
diff --git a/kernel/sched/grid/qos.c b/kernel/sched/grid/qos.c
index 7c4cb867b60b3d72b93a84ad02e3dbbc264bfcfa..e1504170cc6cc53c5028fc38edd1aa959b95710d 100644
--- a/kernel/sched/grid/qos.c
+++ b/kernel/sched/grid/qos.c
@@ -71,6 +71,9 @@ int sched_grid_qos_fork(struct task_struct *p, struct task_struct *orig)
 
 void sched_grid_qos_free(struct task_struct *p)
 {
+	if (!p->grid_qos)
+		return;
+
 	kfree(p->grid_qos);
 	p->grid_qos = NULL;
 }