diff --git a/src/components/TreeSelect/TreeSelect.tsx b/src/components/TreeSelect/TreeSelect.tsx
index 7de1fce9d6..b2e12fc5bf 100644
--- a/src/components/TreeSelect/TreeSelect.tsx
+++ b/src/components/TreeSelect/TreeSelect.tsx
@@ -56,7 +56,7 @@ export const TreeSelect = React.forwardRef(function TreeSelect<T>(
         onOpenChange,
         renderControl,
         renderItem,
-        renderContainer: RenderContainer = TreeListContainer,
+        renderContainer = TreeListContainer,
         onItemClick,
     } = props;
 
@@ -210,18 +210,18 @@ export const TreeSelect = React.forwardRef(function TreeSelect<T>(
         <SelectControl
             {...controlProps}
             selectedOptionsContent={React.Children.toArray(
-                value.map((id) => {
+                value.map((itemId) => {
                     if ('renderControlContent' in props) {
-                        return props.renderControlContent(listParsedState.itemsById[id]).title;
+                        return props.renderControlContent(listParsedState.itemsById[itemId]).title;
                     }
 
-                    const items = listParsedState.itemsById[id];
+                    const item = listParsedState.itemsById[itemId];
 
-                    if (isKnownStructureGuard(items)) {
-                        return items.title;
+                    if (isKnownStructureGuard(item)) {
+                        return item.title;
                     }
 
-                    return items as string;
+                    return item as string;
                 }),
             ).join(', ')}
             view="normal"
@@ -262,15 +262,15 @@ export const TreeSelect = React.forwardRef(function TreeSelect<T>(
                 id={`tree-select-popup-${treeSelectId}`}
             >
                 {slotBeforeListBody}
-                <RenderContainer
-                    size={size}
-                    containerRef={containerRef}
-                    id={`list-${treeSelectId}`}
-                    {...listParsedState}
-                    {...listState}
-                    renderItem={(id, index, renderContextProps) => {
+                {renderContainer({
+                    size,
+                    containerRef,
+                    id: `list-${treeSelectId}`,
+                    ...listParsedState,
+                    ...listState,
+                    renderItem: (itemId, index, renderContextProps) => {
                         const renderState = getItemRenderState({
-                            id,
+                            id: itemId,
                             size,
                             onItemClick: handleItemClick,
                             ...listParsedState,
@@ -291,7 +291,7 @@ export const TreeSelect = React.forwardRef(function TreeSelect<T>(
                             });
                         }
 
-                        const itemData = listParsedState.itemsById[id];
+                        const itemData = listParsedState.itemsById[itemId];
 
                         return (
                             <TreeSelectItem
@@ -305,8 +305,8 @@ export const TreeSelect = React.forwardRef(function TreeSelect<T>(
                                 {...renderContextProps}
                             />
                         );
-                    }}
-                />
+                    },
+                })}
                 {slotAfterListBody}
             </SelectPopup>
         </Flex>