diff --git a/src/sql/workbench/api/common/extHostModelViewTree.ts b/src/sql/workbench/api/common/extHostModelViewTree.ts
index 3ced90d841..a59ff2e649 100644
--- a/src/sql/workbench/api/common/extHostModelViewTree.ts
+++ b/src/sql/workbench/api/common/extHostModelViewTree.ts
@@ -161,8 +161,10 @@ export class ExtHostTreeView<T> extends vsTreeExt.ExtHostTreeView<T> {
 	}
 
 	protected createTreeNode(element: T, extensionTreeItem: azdata.TreeComponentItem, parent?: vsTreeExt.TreeNode): vsTreeExt.TreeNode {
-		let item = super.createTreeNode(element, extensionTreeItem, parent);
-		item = Object.assign({}, item, { checked: extensionTreeItem.checked, enabled: extensionTreeItem.enabled });
-		return item;
+		let node = super.createTreeNode(element, extensionTreeItem, parent);
+		if (node.item) {
+			node.item = Object.assign(node.item, { checked: extensionTreeItem.checked, enabled: extensionTreeItem.enabled });
+		}
+		return node;
 	}
 }