diff --git a/src/VisualStudio/Core/Def/Implementation/TableDataSource/VisualStudioDiagnosticListTable.cs b/src/VisualStudio/Core/Def/Implementation/TableDataSource/VisualStudioDiagnosticListTable.cs
index c88b2511d7b36844f53b09bfe12f598878a69d76..7eb1e2ea1ba8d8a216dadb5f4a6f7298e778a5a4 100644
--- a/src/VisualStudio/Core/Def/Implementation/TableDataSource/VisualStudioDiagnosticListTable.cs
+++ b/src/VisualStudio/Core/Def/Implementation/TableDataSource/VisualStudioDiagnosticListTable.cs
@@ -49,6 +49,11 @@ internal class VisualStudioDiagnosticListTable : VisualStudioBaseDiagnosticListT
 
         private ITableDataSource GetCurrentDataSource()
         {
+            if (_errorList == null)
+            {
+                return _liveTableSource;
+            }
+
             return _errorList.AreOtherErrorSourceEntriesShown ? (ITableDataSource)_liveTableSource : _buildTableSource;
         }