diff --git a/webapp/packages/core-ui/src/Tabs/TabsState.tsx b/webapp/packages/core-ui/src/Tabs/TabsState.tsx
index 0dbb790167..d609aacd9e 100644
--- a/webapp/packages/core-ui/src/Tabs/TabsState.tsx
+++ b/webapp/packages/core-ui/src/Tabs/TabsState.tsx
@@ -53,7 +53,7 @@ export const TabsState = observer(function TabsState<T = Record<string, any>>({
   const props = rest as any as T;
   if (
     !selectedId
-    && !currentTabId
+    && currentTabId === undefined
     && container
   ) {
     const displayed = container.getIdList(props);
@@ -88,7 +88,7 @@ export const TabsState = observer(function TabsState<T = Record<string, any>>({
     tabList,
   });
 
-  if (currentTabId) {
+  if (currentTabId !== undefined) {
     state.selectedId = currentTabId;
     dynamic.selectedId = currentTabId;
   }
diff --git a/webapp/packages/plugin-tools-panel/src/ToolsPanel/ToolsPanel.tsx b/webapp/packages/plugin-tools-panel/src/ToolsPanel/ToolsPanel.tsx
index 226f15673b..1b9587a84d 100644
--- a/webapp/packages/plugin-tools-panel/src/ToolsPanel/ToolsPanel.tsx
+++ b/webapp/packages/plugin-tools-panel/src/ToolsPanel/ToolsPanel.tsx
@@ -97,7 +97,12 @@ export const ToolsPanel = observer<Props>(function ToolsPanel({ container }) {
   }
 
   return styled(useStyles(tabStyle, formStyles))(
-    <TabsState currentTabId={state.selectedTabId} container={container} lazy onChange={handleTabChange}>
+    <TabsState
+      currentTabId={state.selectedTabId ?? undefined}
+      container={container}
+      lazy
+      onChange={handleTabChange}
+    >
       <box>
         <TabList style={tabStyle} />
         <content-box>