diff --git a/src/VisualStudio/Core/Def/Implementation/TableDataSource/VisualStudioDiagnosticListTable.cs b/src/VisualStudio/Core/Def/Implementation/TableDataSource/VisualStudioDiagnosticListTable.cs
index d30ba095e703f34f33d5e6f3ca9f7d94119f795e..6c1b4240453b348a2aa11af9ba698d33ec5affa2 100644
--- a/src/VisualStudio/Core/Def/Implementation/TableDataSource/VisualStudioDiagnosticListTable.cs
+++ b/src/VisualStudio/Core/Def/Implementation/TableDataSource/VisualStudioDiagnosticListTable.cs
@@ -144,13 +144,17 @@ private void ConnectToBuildUpdateSource(ExternalErrorDiagnosticUpdateSource erro
 
                 SetStableState(errorSource.IsInProgress);
 
-                errorSource.DiagnosticsUpdated += OnDiagnosticsUpdated;
                 errorSource.BuildStarted += OnBuildStarted;
             }
 
             private void OnBuildStarted(object sender, bool started)
             {
                 SetStableState(started);
+
+                if (!started)
+                {
+                    OnDataAddedOrChanged(this, _buildErrorSource.GetBuildErrors().Length);
+                }
             }
 
             private void SetStableState(bool started)
@@ -163,11 +167,6 @@ private void SetStableState(bool started)
             public override string SourceTypeIdentifier => StandardTableDataSources.ErrorTableDataSource;
             public override string Identifier => IdentifierString;
 
-            private void OnDiagnosticsUpdated(object sender, DiagnosticsUpdatedArgs e)
-            {
-                OnDataAddedOrChanged(this, _buildErrorSource.GetBuildErrors().Length);
-            }
-
             protected void OnDataAddedOrChanged(object key, int itemCount)
             {
                 // reuse factory. it is okay to re-use factory since we make sure we remove the factory before