diff --git a/src/Microsoft.VisualStudio.Threading.Analyzers.CSharp/VSTHRD010MainThreadUsageAnalyzer.cs b/src/Microsoft.VisualStudio.Threading.Analyzers.CSharp/VSTHRD010MainThreadUsageAnalyzer.cs
index e3c366283..55bb07f31 100644
--- a/src/Microsoft.VisualStudio.Threading.Analyzers.CSharp/VSTHRD010MainThreadUsageAnalyzer.cs
+++ b/src/Microsoft.VisualStudio.Threading.Analyzers.CSharp/VSTHRD010MainThreadUsageAnalyzer.cs
@@ -64,7 +64,8 @@ public class VSTHRD010MainThreadUsageAnalyzer : DiagnosticAnalyzer
             helpLinkUri: Utils.GetHelpLink(Id),
             category: "Usage",
             defaultSeverity: DiagnosticSeverity.Warning,
-            isEnabledByDefault: true);
+            isEnabledByDefault: true,
+            customTags: "CompilationEnd" /*WellKnownDiagnosticTags.CompilationEnd*/);
 
         /// <summary>
         /// The descriptor to use for diagnostics reported in async methods.
@@ -76,7 +77,8 @@ public class VSTHRD010MainThreadUsageAnalyzer : DiagnosticAnalyzer
             helpLinkUri: Utils.GetHelpLink(Id),
             category: "Usage",
             defaultSeverity: DiagnosticSeverity.Warning,
-            isEnabledByDefault: true);
+            isEnabledByDefault: true,
+            customTags: "CompilationEnd" /*WellKnownDiagnosticTags.CompilationEnd*/);
 
         /// <summary>
         /// A reusable value to return from <see cref="SupportedDiagnostics"/>.