diff --git a/src/internal/task/queue.go b/src/internal/task/queue.go
index c86bc596..4b0a22bf 100644
--- a/src/internal/task/queue.go
+++ b/src/internal/task/queue.go
@@ -68,8 +68,8 @@ func (s *Stack) Pop() *Task {
 	t := s.top
 	if t != nil {
 		s.top = t.Next
+		t.Next = nil
 	}
-	t.Next = nil
 	return t
 }