diff --git a/src/Microsoft.SqlTools.CoreServices/Connection/ConnectionServiceCore.cs b/src/Microsoft.SqlTools.CoreServices/Connection/ConnectionServiceCore.cs
index f5a72f87..b74d76f4 100644
--- a/src/Microsoft.SqlTools.CoreServices/Connection/ConnectionServiceCore.cs
+++ b/src/Microsoft.SqlTools.CoreServices/Connection/ConnectionServiceCore.cs
@@ -922,7 +922,7 @@ namespace Microsoft.SqlTools.CoreServices.Connection
             }
 
             string[] results;
-            var systemDBSet = new HashSet<string>(new[] {"master", "model", "msdb", "tempdb"});
+            var systemDBSet = new HashSet<string>(new[] {"master", "model", "msdb", "tempdb", "DWConfiguration", "DWDiagnostics", "DWQueue"});
             if (includeSystemDBs)
             {
                 // Put system databases at the top of the list