diff --git a/vscode/src/azure/providerProperties.ts b/vscode/src/azure/providerProperties.ts
index e8b2176279..81f7191e9d 100644
--- a/vscode/src/azure/providerProperties.ts
+++ b/vscode/src/azure/providerProperties.ts
@@ -13,9 +13,8 @@ export function targetSupportQir(target: string) {
   // Note: Most of these should be dynamic at some point, with configuration coming
   // from the service, and able to be overridden by settings.
   return (
-    target.startsWith("ionq") ||
-    target.startsWith("quantinuum") ||
-    target.startsWith("rigetti")
+    !(target == "microsoft.estimator") &&
+    !(target.startsWith("microsoft") && target.endsWith("cpu"))
   );
 }
 
@@ -28,5 +27,5 @@ export function shouldExcludeProvider(provider: string) {
 }
 
 export function supportsAdaptive(target: string) {
-  return target.startsWith("quantinuum");
+  return !target.startsWith("ionq") && !target.startsWith("rigetti");
 }