diff --git a/staging/src/k8s.io/apiserver/pkg/features/kube_features.go b/staging/src/k8s.io/apiserver/pkg/features/kube_features.go
index 83fe98fbe08..acc36999065 100644
--- a/staging/src/k8s.io/apiserver/pkg/features/kube_features.go
+++ b/staging/src/k8s.io/apiserver/pkg/features/kube_features.go
@@ -135,6 +135,7 @@ const (
 	// owner: @wojtek-t
 	// alpha: v1.16
 	// beta: v1.20
+	// GA: v1.24
 	//
 	// Deprecates and removes SelfLink from ObjectMeta and ListMeta.
 	RemoveSelfLink featuregate.Feature = "RemoveSelfLink"
@@ -224,7 +225,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
 	StorageVersionAPI:                   {Default: false, PreRelease: featuregate.Alpha},
 	WatchBookmark:                       {Default: true, PreRelease: featuregate.GA, LockToDefault: true},
 	APIPriorityAndFairness:              {Default: true, PreRelease: featuregate.Beta},
-	RemoveSelfLink:                      {Default: true, PreRelease: featuregate.Beta},
+	RemoveSelfLink:                      {Default: true, PreRelease: featuregate.GA, LockToDefault: true},
 	SelectorIndex:                       {Default: true, PreRelease: featuregate.GA, LockToDefault: true},
 	WarningHeaders:                      {Default: true, PreRelease: featuregate.GA, LockToDefault: true},
 	EfficientWatchResumption:            {Default: true, PreRelease: featuregate.GA, LockToDefault: true},