diff --git a/scopes/workspace/workspace/filter.ts b/scopes/workspace/workspace/filter.ts
index 6f8ec838a6d3..bdd92a097262 100644
--- a/scopes/workspace/workspace/filter.ts
+++ b/scopes/workspace/workspace/filter.ts
@@ -128,9 +128,11 @@ export class Filter {
     const compIds = ComponentIdList.fromArray(ids);
     const componentsFromModel = await this.getModelComps(ids);
     const compsDuringMerge = this.byDuringMergeState();
+    const localOnly = this.workspace.listLocalOnly();
     const comps = componentsFromModel
       .filter((c) => compIds.hasWithoutVersion(c.toComponentId()))
       .filter((c) => !compsDuringMerge.hasWithoutVersion(c.toComponentId()))
+      .filter((c) => !localOnly.hasWithoutVersion(c.toComponentId()))
       .filter((c) => c.isHeadSnap());
     return comps.map((c) => c.toComponentIdWithHead());
   }
diff --git a/scopes/workspace/workspace/workspace.ts b/scopes/workspace/workspace/workspace.ts
index e4064262fa0a..0c9e16ea5709 100644
--- a/scopes/workspace/workspace/workspace.ts
+++ b/scopes/workspace/workspace/workspace.ts
@@ -368,7 +368,10 @@ export class Workspace implements ComponentFactory {
     const autoTagPending = await this.consumer.listComponentsForAutoTagging(
       ComponentIdList.fromArray(modifiedComponents)
     );
-    const comps = autoTagPending.filter((autoTagComp) => !newComponents.has(autoTagComp.componentId));
+    const localOnly = this.listLocalOnly();
+    const comps = autoTagPending
+      .filter((autoTagComp) => !newComponents.has(autoTagComp.componentId))
+      .filter((autoTagComp) => !localOnly.has(autoTagComp.componentId));
     return comps.map((c) => c.id);
   }