diff --git a/cmd/poller/poller_test.go b/cmd/poller/poller_test.go
index 9fadebf52..a531b31ac 100644
--- a/cmd/poller/poller_test.go
+++ b/cmd/poller/poller_test.go
@@ -140,6 +140,7 @@ func TestCollectorUpgrade(t *testing.T) {
 
 	ontap911 := conf.Remote{Version: "9.11.1", ZAPIsExist: true}
 	ontap917 := conf.Remote{Version: "9.17.1", ZAPIsExist: false}
+	asaR2 := conf.Remote{Version: "9.16.1", ZAPIsExist: false, IsDisaggregated: true, IsSanOptimized: true}
 	keyPerf := conf.Remote{Version: "9.17.1", ZAPIsExist: false, IsDisaggregated: true}
 	keyPerfWithZapi := conf.Remote{Version: "9.17.1", ZAPIsExist: true, IsDisaggregated: true}
 
@@ -161,6 +162,9 @@ func TestCollectorUpgrade(t *testing.T) {
 		{name: "KeyPerf w/ ZAPI", remote: keyPerfWithZapi, askFor: "Zapi", wantCollector: "Zapi"},
 		{name: "KeyPerf w/ ZAPI", remote: keyPerfWithZapi, askFor: "ZapiPerf", wantCollector: "KeyPerf"},
 		{name: "KeyPerf w/ ZAPI", remote: keyPerfWithZapi, askFor: "RestPerf", wantCollector: "KeyPerf"},
+
+		{name: "ASA R2", remote: asaR2, askFor: "Zapi", wantCollector: "Rest"},
+		{name: "ASA R2", remote: asaR2, askFor: "RestPerf", wantCollector: "KeyPerf"},
 	}
 
 	for _, tt := range tests {
diff --git a/pkg/conf/remotes.go b/pkg/conf/remotes.go
index bc961631b..5184db21d 100644
--- a/pkg/conf/remotes.go
+++ b/pkg/conf/remotes.go
@@ -19,5 +19,5 @@ func (r Remote) IsZero() bool {
 }
 
 func (r Remote) IsKeyPerf() bool {
-	return r.IsDisaggregated && !r.IsSanOptimized
+	return r.IsDisaggregated
 }