diff --git a/pkg/cache/internal/informers_map.go b/pkg/cache/internal/informers_map.go
index 07f2f1261f..f067bf4b62 100644
--- a/pkg/cache/internal/informers_map.go
+++ b/pkg/cache/internal/informers_map.go
@@ -434,12 +434,12 @@ func (w *gvkFixupWatcher) run() {
 		w.ch <- e
 	}
 	w.wg.Done()
+	close(w.ch)
 }
 
 func (w *gvkFixupWatcher) Stop() {
 	w.watcher.Stop()
 	w.wg.Wait()
-	close(w.ch)
 }
 
 func (w *gvkFixupWatcher) ResultChan() <-chan watch.Event {