From c59fa02300f3f2763852ac4eba91d5bf5386a5cb Mon Sep 17 00:00:00 2001
From: Jacob See <5027680+jacobsee@users.noreply.github.com>
Date: Wed, 12 Aug 2026 16:57:10 -0700
Subject: [PATCH] Include all projects when sending initial events, not just
 the bookmark alone

---
 pkg/project/apiserver/registry/project/proxy/proxy.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkg/project/apiserver/registry/project/proxy/proxy.go b/pkg/project/apiserver/registry/project/proxy/proxy.go
index cc91ad2ec..043890efd 100644
--- a/pkg/project/apiserver/registry/project/proxy/proxy.go
+++ b/pkg/project/apiserver/registry/project/proxy/proxy.go
@@ -119,10 +119,11 @@ func (s *REST) Watch(ctx context.Context, options *metainternal.ListOptions) (wa
 	// k8s.io/initial-events-end annotation after initial events (if any).
 	includeAllExistingProjects, sendBookmark := false, false
 	if options != nil {
-		if options.ResourceVersion == "0" {
+		wantInitialEvents := options.SendInitialEvents != nil && *options.SendInitialEvents && options.AllowWatchBookmarks
+		if options.ResourceVersion == "0" || wantInitialEvents {
 			includeAllExistingProjects = true
 		}
-		if options.SendInitialEvents != nil && *options.SendInitialEvents && options.AllowWatchBookmarks {
+		if wantInitialEvents {
 			sendBookmark = true
 		}
 	}