diff --git a/src/sql/workbench/services/objectExplorer/browser/asyncServerTreeRenderer.ts b/src/sql/workbench/services/objectExplorer/browser/asyncServerTreeRenderer.ts
index 127e21bbbc..78f42f4dc7 100644
--- a/src/sql/workbench/services/objectExplorer/browser/asyncServerTreeRenderer.ts
+++ b/src/sql/workbench/services/objectExplorer/browser/asyncServerTreeRenderer.ts
@@ -192,6 +192,7 @@ class TreeNodeTemplate extends Disposable {
 			this._icon.classList.add(iconLowerCaseName);
 		}
 
+		iconRenderer.removeIcon(this._icon);
 		if (element.icon && !instanceOfSqlThemeIcon(element.icon)) {
 			iconRenderer.putIcon(this._icon, element.icon);
 		}
diff --git a/src/sql/workbench/services/objectExplorer/browser/serverTreeRenderer.ts b/src/sql/workbench/services/objectExplorer/browser/serverTreeRenderer.ts
index 93c0662724..5d4bb52ab4 100644
--- a/src/sql/workbench/services/objectExplorer/browser/serverTreeRenderer.ts
+++ b/src/sql/workbench/services/objectExplorer/browser/serverTreeRenderer.ts
@@ -160,6 +160,7 @@ export class ServerTreeRenderer implements IRenderer {
 			templateData.icon.classList.add(iconLowerCaseName);
 		}
 
+		iconRenderer.removeIcon(templateData.icon);
 		if (treeNode.icon && !instanceOfSqlThemeIcon(treeNode.icon)) {
 			iconRenderer.putIcon(templateData.icon, treeNode.icon);
 		}