diff --git a/pkg/addon/agent/addon.go b/pkg/addon/agent/addon.go
index ee8280aa..4248f7df 100644
--- a/pkg/addon/agent/addon.go
+++ b/pkg/addon/agent/addon.go
@@ -57,7 +57,10 @@ func (c *clusterGatewayAddonManager) Manifests(cluster *clusterv1.ManagedCluster
 		managedServiceAccountAddon := &addonv1alpha1.ManagedClusterAddOn{}
 		if err := c.client.Get(
 			context.TODO(),
-			types.NamespacedName{},
+			types.NamespacedName{
+				Namespace: cluster.Name,
+				Name:      "managed-serviceaccount",
+			},
 			managedServiceAccountAddon); err != nil {
 			if apierrors.IsNotFound(err) {
 				return nil, nil