diff --git a/src/components/DiskStateProgressBar/DiskStateProgressBar.tsx b/src/components/DiskStateProgressBar/DiskStateProgressBar.tsx
index e5e4252734..913841ae04 100644
--- a/src/components/DiskStateProgressBar/DiskStateProgressBar.tsx
+++ b/src/components/DiskStateProgressBar/DiskStateProgressBar.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 
 import {SETTING_KEYS} from '../../store/reducers/settings/constants';
+import {useSetting} from '../../store/reducers/settings/useSetting';
 import {cn} from '../../utils/cn';
 import {getSeverityColor} from '../../utils/disks/helpers';
-import {useSetting} from '../../utils/hooks';
 
 import './DiskStateProgressBar.scss';
 
@@ -30,7 +30,7 @@ export function DiskStateProgressBar({
     content,
     className,
 }: DiskStateProgressBarProps) {
-    const [inverted] = useSetting<boolean | undefined>(SETTING_KEYS.INVERTED_DISKS);
+    const {value: inverted} = useSetting<boolean | undefined>(SETTING_KEYS.INVERTED_DISKS);
 
     const mods: Record<string, boolean | undefined> = {inverted, compact, faded, empty, inactive};
 
diff --git a/src/components/JsonViewer/JsonViewer.tsx b/src/components/JsonViewer/JsonViewer.tsx
index 4a1518744b..d8b2a41ee9 100644
--- a/src/components/JsonViewer/JsonViewer.tsx
+++ b/src/components/JsonViewer/JsonViewer.tsx
@@ -6,7 +6,7 @@ import DataTable from '@gravity-ui/react-data-table';
 import {ActionTooltip, Button, Flex, Icon} from '@gravity-ui/uikit';
 
 import {SETTING_KEYS} from '../../store/reducers/settings/constants';
-import {useSetting} from '../../utils/hooks';
+import {useSetting} from '../../store/reducers/settings/useSetting';
 import type {ClipboardButtonProps} from '../ClipboardButton/ClipboardButton';
 import {ClipboardButton} from '../ClipboardButton/ClipboardButton';
 
@@ -121,9 +121,8 @@ function JsonViewerComponent({
     toolbarClassName,
     withClipboardButton,
 }: JsonViewerComponentProps) {
-    const [caseSensitiveSearch, setCaseSensitiveSearch] = useSetting(
+    const {value: caseSensitiveSearch, saveValue: setCaseSensitiveSearch} = useSetting<boolean>(
         SETTING_KEYS.CASE_SENSITIVE_JSON_SEARCH,
-        false,
     );
 
     const [collapsedState, setCollapsedState] = React.useState<CollapsedState>(() => {
diff --git a/src/components/NetworkTable/hooks.ts b/src/components/NetworkTable/hooks.ts
index 0005d2b581..528a0ab624 100644
--- a/src/components/NetworkTable/hooks.ts
+++ b/src/components/NetworkTable/hooks.ts
@@ -3,18 +3,18 @@ import {
     useViewerNodesHandlerHasNetworkStats,
 } from '../../store/reducers/capabilities/hooks';
 import {SETTING_KEYS} from '../../store/reducers/settings/constants';
-import {useSetting} from '../../utils/hooks';
+import {useSetting} from '../../store/reducers/settings/useSetting';
 
 export function useShouldShowDatabaseNetworkTable() {
     const viewerNodesHasNetworkStats = useViewerNodesHandlerHasNetworkStats();
-    const [networkTableEnabled] = useSetting(SETTING_KEYS.ENABLE_NETWORK_TABLE);
+    const {value: networkTableEnabled} = useSetting(SETTING_KEYS.ENABLE_NETWORK_TABLE);
 
     return Boolean(viewerNodesHasNetworkStats && networkTableEnabled);
 }
 
 export function useShouldShowClusterNetworkTable() {
     const nodesHasWorkingClusterNetworkStats = useNodesHandlerHasWorkingClusterNetworkStats();
-    const [networkTableEnabled] = useSetting(SETTING_KEYS.ENABLE_NETWORK_TABLE);
+    const {value: networkTableEnabled} = useSetting(SETTING_KEYS.ENABLE_NETWORK_TABLE);
 
     return Boolean(nodesHasWorkingClusterNetworkStats && networkTableEnabled);
 }
diff --git a/src/containers/App/Providers.tsx b/src/containers/App/Providers.tsx
index f2c8b32591..198f68bfa2 100644
--- a/src/containers/App/Providers.tsx
+++ b/src/containers/App/Providers.tsx
@@ -14,8 +14,8 @@ import {ComponentsProvider} from '../../components/ComponentsProvider/Components
 import {componentsRegistry as defaultComponentsRegistry} from '../../components/ComponentsProvider/componentsRegistry';
 import type {ComponentsRegistry} from '../../components/ComponentsProvider/componentsRegistry';
 import {SETTING_KEYS} from '../../store/reducers/settings/constants';
+import {useSetting} from '../../store/reducers/settings/useSetting';
 import {toaster} from '../../utils/createToast';
-import {useSetting} from '../../utils/hooks';
 
 import {AppTitleProvider} from './AppTitleContext';
 
@@ -57,7 +57,7 @@ export function Providers({
 }
 
 function Theme({children}: {children: React.ReactNode}) {
-    const [theme] = useSetting<string | undefined>(SETTING_KEYS.THEME);
+    const {value: theme} = useSetting<string | undefined>(SETTING_KEYS.THEME);
 
     return <ThemeProvider theme={theme}>{children}</ThemeProvider>;
 }
diff --git a/src/containers/AppWithClusters/utils/useAdditionalTenantsProps.tsx b/src/containers/AppWithClusters/utils/useAdditionalTenantsProps.tsx
index 5a5f45c92f..2461e7c371 100644
--- a/src/containers/AppWithClusters/utils/useAdditionalTenantsProps.tsx
+++ b/src/containers/AppWithClusters/utils/useAdditionalTenantsProps.tsx
@@ -2,11 +2,11 @@ import {isNil} from 'lodash';
 
 import {useClusterBaseInfo} from '../../../store/reducers/cluster/cluster';
 import {SETTING_KEYS} from '../../../store/reducers/settings/constants';
+import {useSetting} from '../../../store/reducers/settings/useSetting';
 import type {AdditionalTenantsProps} from '../../../types/additionalProps';
 import type {ETenantType} from '../../../types/api/tenant';
 import type {GetDatabaseLinks} from '../../../uiFactory/types';
 import {uiFactory} from '../../../uiFactory/uiFactory';
-import {useSetting} from '../../../utils/hooks';
 import type {GetLogsLink} from '../../../utils/logs';
 import type {GetMonitoringLink} from '../../../utils/monitoring';
 import {prepareBackendFromBalancer} from '../../../utils/parseBalancer';
@@ -23,7 +23,7 @@ export function useAdditionalTenantsProps({
     getDatabaseLinks,
 }: GetAdditionalTenantsProps) {
     const clusterInfo = useClusterBaseInfo();
-    const [useClusterBalancerAsBackend] = useSetting<boolean>(
+    const {value: useClusterBalancerAsBackend} = useSetting<boolean>(
         SETTING_KEYS.USE_CLUSTER_BALANCER_AS_BACKEND,
     );
 
diff --git a/src/containers/AsideNavigation/AsideNavigation.tsx b/src/containers/AsideNavigation/AsideNavigation.tsx
index 18d14e88d7..8b550d20ba 100644
--- a/src/containers/AsideNavigation/AsideNavigation.tsx
+++ b/src/containers/AsideNavigation/AsideNavigation.tsx
@@ -7,8 +7,8 @@ import type {IconData} from '@gravity-ui/uikit';
 import {useHistory} from 'react-router-dom';
 
 import {SETTING_KEYS} from '../../store/reducers/settings/constants';
+import {useSetting} from '../../store/reducers/settings/useSetting';
 import {cn} from '../../utils/cn';
-import {useSetting} from '../../utils/hooks';
 
 import {InformationPopup} from './InformationPopup';
 import {useHotkeysPanel} from './hooks/useHotkeysPanel';
@@ -76,7 +76,9 @@ export function AsideNavigation(props: AsideNavigationProps) {
 
     const [visiblePanel, setVisiblePanel] = React.useState<Panel>();
     const [informationPopupVisible, setInformationPopupVisible] = React.useState(false);
-    const [compact, setIsCompact] = useSetting<boolean>(SETTING_KEYS.ASIDE_HEADER_COMPACT);
+    const {value: compact, saveValue: setIsCompact} = useSetting<boolean>(
+        SETTING_KEYS.ASIDE_HEADER_COMPACT,
+    );
 
     const toggleInformationPopup = () => setInformationPopupVisible((prev) => !prev);
 
@@ -110,7 +112,7 @@ export function AsideNavigation(props: AsideNavigationProps) {
                     onClick: () => history.push('/'),
                 }}
                 menuItems={props.menuItems}
-                compact={compact}
+                compact={Boolean(compact)}
                 onChangeCompact={setIsCompact}
                 className={b()}
                 renderContent={() => props.content}
diff --git a/src/containers/AsideNavigation/InformationPopup/InformationPopup.tsx b/src/containers/AsideNavigation/InformationPopup/InformationPopup.tsx
index ccef8bbe32..1c3134aa03 100644
--- a/src/containers/AsideNavigation/InformationPopup/InformationPopup.tsx
+++ b/src/containers/AsideNavigation/InformationPopup/InformationPopup.tsx
@@ -1,8 +1,6 @@
 import {Keyboard} from '@gravity-ui/icons';
 import {Flex, Hotkey, Icon, Link, List, Text} from '@gravity-ui/uikit';
 
-import {settingsManager} from '../../../services/settings';
-import {SETTING_KEYS} from '../../../store/reducers/settings/constants';
 import {cn} from '../../../utils/cn';
 import {SHORTCUTS_HOTKEY} from '../hooks/useHotkeysPanel';
 import i18n from '../i18n';
@@ -16,14 +14,6 @@ export interface InformationPopupProps {
 }
 
 export function InformationPopup({onKeyboardShortcutsClick}: InformationPopupProps) {
-    const getDocumentationLink = () => {
-        const lang = settingsManager.readUserSettingsValue(
-            SETTING_KEYS.LANGUAGE,
-            navigator.language,
-        );
-        return lang === 'ru' ? 'https://ydb.tech/docs/ru/' : 'https://ydb.tech/docs/en/';
-    };
-
     return (
         <div className={b('content', {})}>
             <div className={b('docs')}>
@@ -35,7 +25,7 @@ export function InformationPopup({onKeyboardShortcutsClick}: InformationPopupPro
                         items={[
                             {
                                 text: i18n('help-center.item.documentation'),
-                                url: getDocumentationLink(),
+                                url: 'https://ydb.tech/docs',
                             },
                         ]}
                         filterable={false}
diff --git a/src/containers/Cluster/ClusterOverview/ClusterOverview.tsx b/src/containers/Cluster/ClusterOverview/ClusterOverview.tsx
index 56c3769fb8..8d9d19f3df 100644
--- a/src/containers/Cluster/ClusterOverview/ClusterOverview.tsx
+++ b/src/containers/Cluster/ClusterOverview/ClusterOverview.tsx
@@ -9,13 +9,13 @@ import {
 } from '../../../store/reducers/capabilities/hooks';
 import type {ClusterGroupsStats} from '../../../store/reducers/cluster/types';
 import {SETTING_KEYS} from '../../../store/reducers/settings/constants';
+import {useSetting} from '../../../store/reducers/settings/useSetting';
 import type {AdditionalClusterProps} from '../../../types/additionalProps';
 import {isClusterInfoV2, isClusterInfoV5} from '../../../types/api/cluster';
 import type {TClusterInfo} from '../../../types/api/cluster';
 import type {IResponseError} from '../../../types/api/error';
 import {valueIsDefined} from '../../../utils';
 import {useResizeObserverTrigger} from '../../../utils/hooks/useResizeObserverTrigger';
-import {useSetting} from '../../../utils/hooks/useSetting';
 import {ClusterInfo} from '../ClusterInfo/ClusterInfo';
 import i18n from '../i18n';
 import {getTotalStorageGroupsUsed} from '../utils';
@@ -41,7 +41,7 @@ interface ClusterOverviewProps {
 }
 
 export function ClusterOverview(props: ClusterOverviewProps) {
-    const [expandDashboard, setExpandDashboard] = useSetting<boolean>(
+    const {value: expandDashboard, saveValue: setExpandDashboard} = useSetting<boolean>(
         SETTING_KEYS.EXPAND_CLUSTER_DASHBOARD,
     );
 
diff --git a/src/containers/Cluster/ClusterOverview/components/ClusterMetricsNetwork.tsx b/src/containers/Cluster/ClusterOverview/components/ClusterMetricsNetwork.tsx
index 3f06f99445..fa79d365aa 100644
--- a/src/containers/Cluster/ClusterOverview/components/ClusterMetricsNetwork.tsx
+++ b/src/containers/Cluster/ClusterOverview/components/ClusterMetricsNetwork.tsx
@@ -1,7 +1,7 @@
 import {DoughnutMetrics} from '../../../../components/DoughnutMetrics/DoughnutMetrics';
 import {SETTING_KEYS} from '../../../../store/reducers/settings/constants';
+import {useSetting} from '../../../../store/reducers/settings/useSetting';
 import {formatBytes} from '../../../../utils/bytesParsers';
-import {useSetting} from '../../../../utils/hooks/useSetting';
 import i18n from '../../i18n';
 import type {ClusterMetricsBaseProps} from '../shared';
 import {calculateBaseDiagramValues} from '../utils';
@@ -23,7 +23,9 @@ export function ClusterMetricsNetwork({
     collapsed,
     ...rest
 }: ClusterMetricsNetworkProps) {
-    const [showNetworkUtilization] = useSetting<boolean>(SETTING_KEYS.SHOW_NETWORK_UTILIZATION);
+    const {value: showNetworkUtilization} = useSetting<boolean>(
+        SETTING_KEYS.SHOW_NETWORK_UTILIZATION,
+    );
     if (!showNetworkUtilization) {
         return null;
     }
diff --git a/src/containers/Tenant/Diagnostics/HotKeys/HotKeys.tsx b/src/containers/Tenant/Diagnostics/HotKeys/HotKeys.tsx
index 5bfa29ea1e..5701ddfd55 100644
--- a/src/containers/Tenant/Diagnostics/HotKeys/HotKeys.tsx
+++ b/src/containers/Tenant/Diagnostics/HotKeys/HotKeys.tsx
@@ -10,10 +10,11 @@ import {ResizeableDataTable} from '../../../../components/ResizeableDataTable/Re
 import {hotKeysApi} from '../../../../store/reducers/hotKeys/hotKeys';
 import {overviewApi} from '../../../../store/reducers/overview/overview';
 import {SETTING_KEYS} from '../../../../store/reducers/settings/constants';
+import {useSetting} from '../../../../store/reducers/settings/useSetting';
 import type {HotKey} from '../../../../types/api/hotkeys';
 import {cn} from '../../../../utils/cn';
 import {DEFAULT_TABLE_SETTINGS} from '../../../../utils/constants';
-import {useAutoRefreshInterval, useSetting} from '../../../../utils/hooks';
+import {useAutoRefreshInterval} from '../../../../utils/hooks';
 
 import i18n from './i18n';
 
@@ -121,7 +122,9 @@ export function HotKeys({path, database, databaseFullPath}: HotKeysProps) {
 }
 
 function HelpCard() {
-    const [helpHidden, setHelpHidden] = useSetting(SETTING_KEYS.IS_HOTKEYS_HELP_HIDDEN);
+    const {value: helpHidden, saveValue: setHelpHidden} = useSetting(
+        SETTING_KEYS.IS_HOTKEYS_HELP_HIDDEN,
+    );
 
     if (helpHidden) {
         return null;
diff --git a/src/containers/Tenant/Diagnostics/TenantOverview/MetricsTabs/MetricsTabs.tsx b/src/containers/Tenant/Diagnostics/TenantOverview/MetricsTabs/MetricsTabs.tsx
index 3a6d15720b..697774c03c 100644
--- a/src/containers/Tenant/Diagnostics/TenantOverview/MetricsTabs/MetricsTabs.tsx
+++ b/src/containers/Tenant/Diagnostics/TenantOverview/MetricsTabs/MetricsTabs.tsx
@@ -5,6 +5,7 @@ import {useLocation} from 'react-router-dom';
 
 import {getTenantPath, parseQuery} from '../../../../../routes';
 import {SETTING_KEYS} from '../../../../../store/reducers/settings/constants';
+import {useSetting} from '../../../../../store/reducers/settings/useSetting';
 import {TENANT_METRICS_TABS_IDS} from '../../../../../store/reducers/tenant/constants';
 import type {TenantMetricsTab} from '../../../../../store/reducers/tenant/types';
 import type {
@@ -14,7 +15,6 @@ import type {
 } from '../../../../../store/reducers/tenants/utils';
 import type {ETenantType} from '../../../../../types/api/tenant';
 import {cn} from '../../../../../utils/cn';
-import {useSetting} from '../../../../../utils/hooks';
 import {calculateMetricAggregates} from '../../../../../utils/metrics';
 // no direct legend formatters needed here – handled in subcomponents
 import {TenantTabsGroups} from '../../../TenantPages';
@@ -99,7 +99,9 @@ export function MetricsTabs({
     );
 
     // Pass raw network values; DedicatedMetricsTabs computes percent and legend
-    const [showNetworkUtilization] = useSetting<boolean>(SETTING_KEYS.SHOW_NETWORK_UTILIZATION);
+    const {value: showNetworkUtilization} = useSetting<boolean>(
+        SETTING_KEYS.SHOW_NETWORK_UTILIZATION,
+    );
 
     // card variant is handled within subcomponents
 
diff --git a/src/containers/Tenant/Diagnostics/TenantOverview/TenantNetwork/TenantNetwork.tsx b/src/containers/Tenant/Diagnostics/TenantOverview/TenantNetwork/TenantNetwork.tsx
index f4522a16d9..bd8bd1c7f0 100644
--- a/src/containers/Tenant/Diagnostics/TenantOverview/TenantNetwork/TenantNetwork.tsx
+++ b/src/containers/Tenant/Diagnostics/TenantOverview/TenantNetwork/TenantNetwork.tsx
@@ -2,9 +2,10 @@ import {Flex} from '@gravity-ui/uikit';
 
 import {getTenantPath} from '../../../../../routes';
 import {SETTING_KEYS} from '../../../../../store/reducers/settings/constants';
+import {useSetting} from '../../../../../store/reducers/settings/useSetting';
 import {TENANT_DIAGNOSTICS_TABS_IDS} from '../../../../../store/reducers/tenant/constants';
 import {cn} from '../../../../../utils/cn';
-import {useSearchQuery, useSetting} from '../../../../../utils/hooks';
+import {useSearchQuery} from '../../../../../utils/hooks';
 import {TenantTabsGroups} from '../../../TenantPages';
 import {StatsWrapper} from '../StatsWrapper/StatsWrapper';
 import i18n from '../i18n';
@@ -22,7 +23,7 @@ interface TenantNetworkProps {
 
 export function TenantNetwork({database}: TenantNetworkProps) {
     const query = useSearchQuery();
-    const [networkTableEnabled] = useSetting(SETTING_KEYS.ENABLE_NETWORK_TABLE);
+    const {value: networkTableEnabled} = useSetting(SETTING_KEYS.ENABLE_NETWORK_TABLE);
 
     const tab = networkTableEnabled
         ? {[TenantTabsGroups.diagnosticsTab]: TENANT_DIAGNOSTICS_TABS_IDS.network}
diff --git a/src/containers/Tenant/Diagnostics/TenantOverview/TenantOverview.tsx b/src/containers/Tenant/Diagnostics/TenantOverview/TenantOverview.tsx
index bb1e6f248c..bd61d040e6 100644
--- a/src/containers/Tenant/Diagnostics/TenantOverview/TenantOverview.tsx
+++ b/src/containers/Tenant/Diagnostics/TenantOverview/TenantOverview.tsx
@@ -12,11 +12,7 @@ import {
     TENANT_METRICS_TABS_IDS,
     TENANT_PAGES_IDS,
 } from '../../../../store/reducers/tenant/constants';
-import {
-    setDiagnosticsTab,
-    setTenantPage,
-    tenantApi,
-} from '../../../../store/reducers/tenant/tenant';
+import {setDiagnosticsTab, tenantApi} from '../../../../store/reducers/tenant/tenant';
 import {calculateTenantMetrics} from '../../../../store/reducers/tenants/utils';
 import type {AdditionalTenantsProps} from '../../../../types/additionalProps';
 import {getInfoTabLinks} from '../../../../utils/additionalProps';
@@ -24,6 +20,7 @@ import {TENANT_DEFAULT_TITLE} from '../../../../utils/constants';
 import {useAutoRefreshInterval, useTypedDispatch, useTypedSelector} from '../../../../utils/hooks';
 import {useClusterNameFromQuery} from '../../../../utils/hooks/useDatabaseFromQuery';
 import {canShowTenantMonitoringTab} from '../../../../utils/monitoringVisibility';
+import {useTenantPage} from '../../TenantNavigation/useTenantNavigation';
 import {mapDatabaseTypeToDBName} from '../../utils/schema';
 
 import {HealthcheckPreview} from './Healthcheck/HealthcheckPreview';
@@ -53,6 +50,8 @@ export function TenantOverview({
     const clusterName = useClusterNameFromQuery();
     const dispatch = useTypedDispatch();
 
+    const {handleTenantPageChange} = useTenantPage();
+
     const isMetaDatabasesAvailable = useDatabasesAvailable();
 
     const {currentData: tenant, isFetching} = tenantApi.useGetTenantInfoQuery(
@@ -196,7 +195,7 @@ export function TenantOverview({
     );
 
     const handleOpenMonitoring = () => {
-        dispatch(setTenantPage(TENANT_PAGES_IDS.diagnostics));
+        handleTenantPageChange(TENANT_PAGES_IDS.diagnostics);
         dispatch(setDiagnosticsTab(TENANT_DIAGNOSTICS_TABS_IDS.monitoring));
     };
 
diff --git a/src/containers/Tenant/ObjectGeneral/ObjectGeneral.tsx b/src/containers/Tenant/ObjectGeneral/ObjectGeneral.tsx
index c0565c746e..ee90784ba9 100644
--- a/src/containers/Tenant/ObjectGeneral/ObjectGeneral.tsx
+++ b/src/containers/Tenant/ObjectGeneral/ObjectGeneral.tsx
@@ -3,10 +3,10 @@ import {useThemeValue} from '@gravity-ui/uikit';
 import {TENANT_PAGES_IDS} from '../../../store/reducers/tenant/constants';
 import type {AdditionalTenantsProps} from '../../../types/additionalProps';
 import {cn} from '../../../utils/cn';
-import {useTypedSelector} from '../../../utils/hooks';
 import Diagnostics from '../Diagnostics/Diagnostics';
 import {Query} from '../Query/Query';
 import {TenantNavigation} from '../TenantNavigation/TenantNavigation';
+import {useTenantPage} from '../TenantNavigation/useTenantNavigation';
 
 import './ObjectGeneral.scss';
 
@@ -19,7 +19,7 @@ interface ObjectGeneralProps {
 function ObjectGeneral({additionalTenantProps}: ObjectGeneralProps) {
     const theme = useThemeValue();
 
-    const {tenantPage} = useTypedSelector((state) => state.tenant);
+    const {tenantPage} = useTenantPage();
 
     const renderPageContent = () => {
         switch (tenantPage) {
diff --git a/src/containers/Tenant/ObjectSummary/ObjectSummary.tsx b/src/containers/Tenant/ObjectSummary/ObjectSummary.tsx
index c3fe7b3e86..c1e4c854d2 100644
--- a/src/containers/Tenant/ObjectSummary/ObjectSummary.tsx
+++ b/src/containers/Tenant/ObjectSummary/ObjectSummary.tsx
@@ -36,6 +36,7 @@ import {prepareSystemViewType} from '../../../utils/schema';
 import {EntityTitle} from '../EntityTitle/EntityTitle';
 import {SchemaViewer} from '../Schema/SchemaViewer/SchemaViewer';
 import {useCurrentSchema} from '../TenantContext';
+import {useTenantPage} from '../TenantNavigation/useTenantNavigation';
 import {TENANT_INFO_TABS, TENANT_SCHEMA_TAB, TenantTabsGroups} from '../TenantPages';
 import {useTenantQueryParams} from '../useTenantQueryParams';
 import {getSummaryControls} from '../utils/controls';
@@ -91,6 +92,8 @@ export function ObjectSummary({
         (state) => state.tenant,
     );
 
+    const {handleTenantPageChange} = useTenantPage();
+
     const location = useLocation();
 
     const queryParams = qs.parse(location.search, {
@@ -411,7 +414,7 @@ export function ObjectSummary({
                 {showPreview &&
                     getSummaryControls(
                         dispatch,
-                        {setActivePath: handleSchemaChange},
+                        {setActivePath: handleSchemaChange, setTenantPage: handleTenantPageChange},
                         'm',
                     )(path, 'preview')}
                 <ClipboardButton
diff --git a/src/containers/Tenant/ObjectSummary/SchemaActions.tsx b/src/containers/Tenant/ObjectSummary/SchemaActions.tsx
index 9c96ef1def..51504a3785 100644
--- a/src/containers/Tenant/ObjectSummary/SchemaActions.tsx
+++ b/src/containers/Tenant/ObjectSummary/SchemaActions.tsx
@@ -4,8 +4,9 @@ import {
     TENANT_DIAGNOSTICS_TABS_IDS,
     TENANT_PAGES_IDS,
 } from '../../../store/reducers/tenant/constants';
-import {setDiagnosticsTab, setTenantPage} from '../../../store/reducers/tenant/tenant';
+import {setDiagnosticsTab} from '../../../store/reducers/tenant/tenant';
 import {useTypedDispatch, useTypedSelector} from '../../../utils/hooks';
+import {useTenantPage} from '../TenantNavigation/useTenantNavigation';
 
 import i18n from './i18n';
 
@@ -13,7 +14,10 @@ import ArrowRightFromSquareIcon from '@gravity-ui/icons/svgs/arrow-right-from-sq
 
 export function SchemaActions() {
     const dispatch = useTypedDispatch();
-    const {diagnosticsTab, tenantPage} = useTypedSelector((state) => state.tenant);
+    const {diagnosticsTab} = useTypedSelector((state) => state.tenant);
+
+    const {tenantPage, handleTenantPageChange} = useTenantPage();
+
     const diagnosticsSchemaActive =
         tenantPage === TENANT_PAGES_IDS.diagnostics &&
         diagnosticsTab === TENANT_DIAGNOSTICS_TABS_IDS.schema;
@@ -24,7 +28,7 @@ export function SchemaActions() {
                 <Button
                     title={i18n('action_openInDiagnostics')}
                     onClick={() => {
-                        dispatch(setTenantPage(TENANT_PAGES_IDS.diagnostics));
+                        handleTenantPageChange(TENANT_PAGES_IDS.diagnostics);
                         dispatch(setDiagnosticsTab(TENANT_DIAGNOSTICS_TABS_IDS.schema));
                     }}
                     size="s"
diff --git a/src/containers/Tenant/ObjectSummary/SchemaTree/SchemaTree.tsx b/src/containers/Tenant/ObjectSummary/SchemaTree/SchemaTree.tsx
index 23588e593f..7ebc9ce8e0 100644
--- a/src/containers/Tenant/ObjectSummary/SchemaTree/SchemaTree.tsx
+++ b/src/containers/Tenant/ObjectSummary/SchemaTree/SchemaTree.tsx
@@ -21,6 +21,7 @@ import {valueIsDefined} from '../../../../utils';
 import {useTypedDispatch, useTypedSelector} from '../../../../utils/hooks';
 import {getConfirmation} from '../../../../utils/hooks/withConfirmation/useChangeInputWithConfirmation';
 import {canShowTenantMonitoringTab} from '../../../../utils/monitoringVisibility';
+import {useTenantPage} from '../../TenantNavigation/useTenantNavigation';
 import {getSchemaControls} from '../../utils/controls';
 import {
     isChildlessPathType,
@@ -60,6 +61,8 @@ export function SchemaTree(props: SchemaTreeProps) {
 
     const isTopicPreviewAvailable = useTopicDataAvailable();
 
+    const {handleTenantPageChange} = useTenantPage();
+
     const [createDirectoryOpen, setCreateDirectoryOpen] = React.useState(false);
     const [parentPath, setParentPath] = React.useState('');
     const setSchemaTreeKey = useDispatchTreeKey();
@@ -149,6 +152,7 @@ export function SchemaTree(props: SchemaTreeProps) {
             dispatch,
             {
                 setActivePath: onActivePathUpdate,
+                setTenantPage: handleTenantPageChange,
                 showCreateDirectoryDialog: createDirectoryFeatureAvailable
                     ? handleOpenCreateDirectoryDialog
                     : undefined,
@@ -216,6 +220,7 @@ export function SchemaTree(props: SchemaTreeProps) {
                     dispatch,
                     {
                         setActivePath: onActivePathUpdate,
+                        setTenantPage: handleTenantPageChange,
                     },
                     undefined,
                     isTopicPreviewAvailable,
diff --git a/src/containers/Tenant/Query/QueriesHistory/QueriesHistory.tsx b/src/containers/Tenant/Query/QueriesHistory/QueriesHistory.tsx
index 03dd2a22a1..b5df6a9014 100644
--- a/src/containers/Tenant/Query/QueriesHistory/QueriesHistory.tsx
+++ b/src/containers/Tenant/Query/QueriesHistory/QueriesHistory.tsx
@@ -1,3 +1,5 @@
+import React from 'react';
+
 import type {Column} from '@gravity-ui/react-data-table';
 
 import {ResizeableDataTable} from '../../../../components/ResizeableDataTable/ResizeableDataTable';
@@ -5,12 +7,12 @@ import {Search} from '../../../../components/Search';
 import {TableWithControlsLayout} from '../../../../components/TableWithControlsLayout/TableWithControlsLayout';
 import {TruncatedQuery} from '../../../../components/TruncatedQuery/TruncatedQuery';
 import {
-    selectQueriesHistory,
     selectQueriesHistoryFilter,
     setIsDirty,
     setQueryHistoryFilter,
 } from '../../../../store/reducers/query/query';
 import type {QueryInHistory} from '../../../../store/reducers/query/types';
+import {useQueriesHistory} from '../../../../store/reducers/query/useQueriesHistory';
 import {TENANT_QUERY_TABS_ID} from '../../../../store/reducers/tenant/constants';
 import {setQueryTab} from '../../../../store/reducers/tenant/tenant';
 import {cn} from '../../../../utils/cn';
@@ -34,9 +36,13 @@ interface QueriesHistoryProps {
 function QueriesHistory({changeUserInput}: QueriesHistoryProps) {
     const dispatch = useTypedDispatch();
 
-    const queriesHistory = useTypedSelector(selectQueriesHistory);
+    const {filteredHistoryQueries, isLoading} = useQueriesHistory();
+
+    const reversedHistory = React.useMemo(() => {
+        return [...filteredHistoryQueries].reverse();
+    }, [filteredHistoryQueries]);
+
     const filter = useTypedSelector(selectQueriesHistoryFilter);
-    const reversedHistory = [...queriesHistory].reverse();
 
     const applyQueryClick = (query: QueryInHistory) => {
         changeUserInput({input: query.queryText});
@@ -96,6 +102,7 @@ function QueriesHistory({changeUserInput}: QueriesHistoryProps) {
                 <ResizeableDataTable
                     columnsWidthLSKey={QUERIES_HISTORY_COLUMNS_WIDTH_LS_KEY}
                     columns={columns}
+                    isLoading={isLoading}
                     data={reversedHistory}
                     settings={QUERY_TABLE_SETTINGS}
                     emptyDataMessage={i18n(filter ? 'history.empty-search' : 'history.empty')}
diff --git a/src/containers/Tenant/Query/QueryEditor/QueryEditor.tsx b/src/containers/Tenant/Query/QueryEditor/QueryEditor.tsx
index a49e344919..7ed841ac19 100644
--- a/src/containers/Tenant/Query/QueryEditor/QueryEditor.tsx
+++ b/src/containers/Tenant/Query/QueryEditor/QueryEditor.tsx
@@ -11,18 +11,17 @@ import {
 } from '../../../../store/reducers/capabilities/hooks';
 import {
     queryApi,
-    saveQueryToHistory,
-    selectQueriesHistory,
-    selectQueriesHistoryCurrentIndex,
     selectResult,
     selectTenantPath,
     setIsDirty,
     setTenantPath,
 } from '../../../../store/reducers/query/query';
 import type {QueryResult} from '../../../../store/reducers/query/types';
+import {useQueriesHistory} from '../../../../store/reducers/query/useQueriesHistory';
 import {setQueryAction} from '../../../../store/reducers/queryActions/queryActions';
 import {selectShowPreview, setShowPreview} from '../../../../store/reducers/schema/schema';
 import {SETTING_KEYS} from '../../../../store/reducers/settings/constants';
+import {useSetting} from '../../../../store/reducers/settings/useSetting';
 import type {EPathSubType, EPathType} from '../../../../types/api/schema';
 import type {QueryAction} from '../../../../types/store/query';
 import {cn} from '../../../../utils/cn';
@@ -34,7 +33,6 @@ import {
     useEventHandler,
     useQueryExecutionSettings,
     useQueryStreamingSetting,
-    useSetting,
     useTypedDispatch,
     useTypedSelector,
 } from '../../../../utils/hooks';
@@ -77,10 +75,11 @@ export default function QueryEditor(props: QueryEditorProps) {
     const {theme, changeUserInput} = props;
     const savedPath = useTypedSelector(selectTenantPath);
     const result = useTypedSelector(selectResult);
-    const historyQueries = useTypedSelector(selectQueriesHistory);
-    const historyCurrentIndex = useTypedSelector(selectQueriesHistoryCurrentIndex);
     const showPreview = useTypedSelector(selectShowPreview);
 
+    const {historyQueries, historyCurrentIndex, saveQueryToHistory, updateQueryInHistory} =
+        useQueriesHistory();
+
     const isResultLoaded = Boolean(result);
 
     const [querySettings] = useQueryExecutionSettings();
@@ -89,13 +88,12 @@ export default function QueryEditor(props: QueryEditorProps) {
         useLastQueryExecutionSettings();
     const {resetBanner} = useChangedQuerySettings();
 
-    const [lastUsedQueryAction, setLastUsedQueryAction] = useSetting<QueryAction>(
+    const {value: lastUsedQueryAction, saveValue: setLastUsedQueryAction} = useSetting<QueryAction>(
         SETTING_KEYS.LAST_USED_QUERY_ACTION,
     );
     const [lastExecutedQueryText, setLastExecutedQueryText] = React.useState<string>('');
-    const [isQueryStreamingEnabled] = useQueryStreamingSetting();
-
-    const [binaryDataInPlainTextDisplay] = useSetting<boolean>(
+    const {value: isQueryStreamingEnabled} = useQueryStreamingSetting();
+    const {value: binaryDataInPlainTextDisplay} = useSetting<boolean>(
         SETTING_KEYS.BINARY_DATA_IN_PLAIN_TEXT_DISPLAY,
     );
 
@@ -182,6 +180,16 @@ export default function QueryEditor(props: QueryEditorProps) {
                 base64: encodeTextWithBase64,
             });
 
+            query
+                .then(({data}) => {
+                    if (data?.queryId) {
+                        updateQueryInHistory(data.queryId, data?.queryStats);
+                    }
+                })
+                .catch((error) => {
+                    console.error('Failed to update query history:', error);
+                });
+
             queryManagerInstance.registerQuery(query);
         }
 
@@ -190,7 +198,7 @@ export default function QueryEditor(props: QueryEditorProps) {
         // Don't save partial queries in history
         if (!partial) {
             if (text !== historyQueries[historyCurrentIndex]?.queryText) {
-                dispatch(saveQueryToHistory({queryText: text, queryId}));
+                saveQueryToHistory(text, queryId);
             }
             dispatch(setIsDirty(false));
         }
diff --git a/src/containers/Tenant/Query/QueryEditor/YqlEditor.tsx b/src/containers/Tenant/Query/QueryEditor/YqlEditor.tsx
index 2606f2b863..7a1fc8fd5c 100644
--- a/src/containers/Tenant/Query/QueryEditor/YqlEditor.tsx
+++ b/src/containers/Tenant/Query/QueryEditor/YqlEditor.tsx
@@ -6,21 +6,12 @@ import throttle from 'lodash/throttle';
 import type Monaco from 'monaco-editor';
 
 import {MonacoEditor} from '../../../../components/MonacoEditor/MonacoEditor';
-import {
-    goToNextQuery,
-    goToPreviousQuery,
-    selectQueriesHistory,
-    selectUserInput,
-    setIsDirty,
-} from '../../../../store/reducers/query/query';
+import {selectUserInput, setIsDirty} from '../../../../store/reducers/query/query';
+import {useQueriesHistory} from '../../../../store/reducers/query/useQueriesHistory';
 import {SETTING_KEYS} from '../../../../store/reducers/settings/constants';
+import {useSetting} from '../../../../store/reducers/settings/useSetting';
 import type {QueryAction} from '../../../../types/store/query';
-import {
-    useEventHandler,
-    useSetting,
-    useTypedDispatch,
-    useTypedSelector,
-} from '../../../../utils/hooks';
+import {useEventHandler, useTypedDispatch, useTypedSelector} from '../../../../utils/hooks';
 import {YQL_LANGUAGE_ID} from '../../../../utils/monaco/constats';
 import {useUpdateErrorsHighlighting} from '../../../../utils/monaco/highlightErrors';
 import {QUERY_ACTIONS} from '../../../../utils/query';
@@ -49,13 +40,15 @@ export function YqlEditor({
     const dispatch = useTypedDispatch();
     const [monacoGhostInstance, setMonacoGhostInstance] =
         React.useState<ReturnType<typeof createMonacoGhostInstance>>();
-    const historyQueries = useTypedSelector(selectQueriesHistory);
-    const [isCodeAssistEnabled] = useSetting(SETTING_KEYS.ENABLE_CODE_ASSISTANT);
+    const {historyQueries, goToPreviousQuery, goToNextQuery} = useQueriesHistory();
+    const {value: isCodeAssistEnabled} = useSetting(SETTING_KEYS.ENABLE_CODE_ASSISTANT);
 
     const editorOptions = useEditorOptions();
     const updateErrorsHighlighting = useUpdateErrorsHighlighting();
 
-    const [lastUsedQueryAction] = useSetting<QueryAction>(SETTING_KEYS.LAST_USED_QUERY_ACTION);
+    const {value: lastUsedQueryAction} = useSetting<QueryAction>(
+        SETTING_KEYS.LAST_USED_QUERY_ACTION,
+    );
 
     const getLastQueryText = useEventHandler(() => {
         if (!historyQueries || historyQueries.length === 0) {
@@ -160,7 +153,7 @@ export function YqlEditor({
             contextMenuGroupId: CONTEXT_MENU_GROUP_ID,
             contextMenuOrder: 2,
             run: () => {
-                dispatch(goToPreviousQuery());
+                goToPreviousQuery();
             },
         });
         editor.addAction({
@@ -169,7 +162,7 @@ export function YqlEditor({
             contextMenuGroupId: CONTEXT_MENU_GROUP_ID,
             contextMenuOrder: 3,
             run: () => {
-                dispatch(goToNextQuery());
+                goToNextQuery();
             },
         });
         editor.addAction({
diff --git a/src/containers/Tenant/Query/QueryEditor/helpers.ts b/src/containers/Tenant/Query/QueryEditor/helpers.ts
index d9a23a2aec..a66f3b936c 100644
--- a/src/containers/Tenant/Query/QueryEditor/helpers.ts
+++ b/src/containers/Tenant/Query/QueryEditor/helpers.ts
@@ -4,10 +4,10 @@ import type {AcceptEvent, DeclineEvent, IgnoreEvent, PromptFile} from '@ydb-plat
 import type Monaco from 'monaco-editor';
 
 import {codeAssistApi} from '../../../../store/reducers/codeAssist/codeAssist';
-import {selectQueriesHistory} from '../../../../store/reducers/query/query';
+import {useQueriesHistory} from '../../../../store/reducers/query/useQueriesHistory';
 import {SETTING_KEYS} from '../../../../store/reducers/settings/constants';
+import {useSetting} from '../../../../store/reducers/settings/useSetting';
 import type {TelemetryOpenTabs} from '../../../../types/api/codeAssist';
-import {useSetting, useTypedSelector} from '../../../../utils/hooks';
 import {YQL_LANGUAGE_ID} from '../../../../utils/monaco/constats';
 import {useSavedQueries} from '../utils/useSavedQueries';
 
@@ -23,8 +23,8 @@ const EDITOR_OPTIONS: EditorOptions = {
 };
 
 export function useEditorOptions() {
-    const [enableAutocomplete] = useSetting(SETTING_KEYS.ENABLE_AUTOCOMPLETE);
-    const [autocompleteOnEnter] = useSetting(SETTING_KEYS.AUTOCOMPLETE_ON_ENTER);
+    const {value: enableAutocomplete} = useSetting(SETTING_KEYS.ENABLE_AUTOCOMPLETE);
+    const {value: autocompleteOnEnter} = useSetting(SETTING_KEYS.AUTOCOMPLETE_ON_ENTER);
 
     const options = React.useMemo<EditorOptions>(() => {
         const useAutocomplete = Boolean(enableAutocomplete);
@@ -45,7 +45,7 @@ export function useCodeAssistHelpers() {
     const [discardSuggestion] = codeAssistApi.useDiscardSuggestionMutation();
     const [ignoreSuggestion] = codeAssistApi.useIgnoreSuggestionMutation();
     const [sendUserQueriesData] = codeAssistApi.useSendUserQueriesDataMutation();
-    const historyQueries = useTypedSelector(selectQueriesHistory);
+    const {historyQueries} = useQueriesHistory();
     const {savedQueries} = useSavedQueries();
 
     const getCodeAssistSuggestions = React.useCallback(
diff --git a/src/containers/Tenant/Query/QueryEditorControls/QueryEditorControls.tsx b/src/containers/Tenant/Query/QueryEditorControls/QueryEditorControls.tsx
index fb26ab0bfe..66d146e2ba 100644
--- a/src/containers/Tenant/Query/QueryEditorControls/QueryEditorControls.tsx
+++ b/src/containers/Tenant/Query/QueryEditorControls/QueryEditorControls.tsx
@@ -21,7 +21,7 @@ const b = cn('ydb-query-editor-controls');
 interface QueryEditorControlsProps {
     isLoading: boolean;
     disabled?: boolean;
-    highlightedAction: QueryAction;
+    highlightedAction?: QueryAction;
     queryId?: string;
     database: string;
     isStreamingEnabled?: boolean;
diff --git a/src/containers/Tenant/Query/QueryResult/QueryResultViewer.tsx b/src/containers/Tenant/Query/QueryResult/QueryResultViewer.tsx
index 4c0d99d5fd..0ab08585c1 100644
--- a/src/containers/Tenant/Query/QueryResult/QueryResultViewer.tsx
+++ b/src/containers/Tenant/Query/QueryResult/QueryResultViewer.tsx
@@ -14,11 +14,12 @@ import {disableFullscreen} from '../../../../store/reducers/fullscreen';
 import {selectResultTab, setResultTab} from '../../../../store/reducers/query/query';
 import type {QueryResult} from '../../../../store/reducers/query/types';
 import {SETTING_KEYS} from '../../../../store/reducers/settings/constants';
+import {useSetting} from '../../../../store/reducers/settings/useSetting';
 import type {ValueOf} from '../../../../types/common';
 import type {QueryAction} from '../../../../types/store/query';
 import {cn} from '../../../../utils/cn';
 import {getStringifiedData} from '../../../../utils/dataFormatters/dataFormatters';
-import {useSetting, useTypedDispatch, useTypedSelector} from '../../../../utils/hooks';
+import {useTypedDispatch, useTypedSelector} from '../../../../utils/hooks';
 import {PaneVisibilityToggleButtons} from '../../utils/paneVisibilityToggleHelpers';
 import {QuerySettingsBanner} from '../QuerySettingsBanner/QuerySettingsBanner';
 import {QueryStoppedBanner} from '../QueryStoppedBanner/QueryStoppedBanner';
@@ -106,7 +107,7 @@ export function QueryResultViewer({
     const isExplain = resultType === 'explain';
 
     const [selectedResultSet, setSelectedResultSet] = React.useState(0);
-    const [useShowPlanToSvg] = useSetting<boolean>(SETTING_KEYS.USE_SHOW_PLAN_SVG);
+    const {value: useShowPlanToSvg} = useSetting<boolean>(SETTING_KEYS.USE_SHOW_PLAN_SVG);
 
     // Get the saved tab for the current query type, or use default
     const getDefaultSection = (): SectionID => {
diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
index b37edde230..8ac6866ff9 100644
--- a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
+++ b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
@@ -10,11 +10,11 @@ import {
     setQueryAction,
 } from '../../../../store/reducers/queryActions/queryActions';
 import {SETTING_KEYS} from '../../../../store/reducers/settings/constants';
+import {useSetting} from '../../../../store/reducers/settings/useSetting';
 import type {QuerySettings} from '../../../../types/store/query';
 import {cn} from '../../../../utils/cn';
 import {
     useQueryExecutionSettings,
-    useSetting,
     useTypedDispatch,
     useTypedSelector,
 } from '../../../../utils/hooks';
@@ -82,7 +82,7 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
         resolver: zodResolver(querySettingsValidationSchema),
     });
 
-    const [useShowPlanToSvg] = useSetting<boolean>(SETTING_KEYS.USE_SHOW_PLAN_SVG);
+    const {value: useShowPlanToSvg} = useSetting<boolean>(SETTING_KEYS.USE_SHOW_PLAN_SVG);
     const enableTracingLevel = useTracingLevelOptionAvailable();
 
     const timeout = watch('timeout');
diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/TimeoutLabel.tsx b/src/containers/Tenant/Query/QuerySettingsDialog/TimeoutLabel.tsx
index 7f23246a1f..73583bf9b8 100644
--- a/src/containers/Tenant/Query/QuerySettingsDialog/TimeoutLabel.tsx
+++ b/src/containers/Tenant/Query/QuerySettingsDialog/TimeoutLabel.tsx
@@ -17,7 +17,7 @@ interface TimeoutLabelProps {
 }
 
 export function TimeoutLabel({isDisabled, isChecked, onToggle}: TimeoutLabelProps) {
-    const [isQueryStreamingEnabled] = useQueryStreamingSetting();
+    const {value: isQueryStreamingEnabled} = useQueryStreamingSetting();
 
     if (isQueryStreamingEnabled) {
         return (
diff --git a/src/containers/Tenant/Query/QueryStoppedBanner/QueryStoppedBanner.tsx b/src/containers/Tenant/Query/QueryStoppedBanner/QueryStoppedBanner.tsx
index d19ef94d66..9855bf7407 100644
--- a/src/containers/Tenant/Query/QueryStoppedBanner/QueryStoppedBanner.tsx
+++ b/src/containers/Tenant/Query/QueryStoppedBanner/QueryStoppedBanner.tsx
@@ -3,17 +3,17 @@ import React from 'react';
 import {Alert} from '@gravity-ui/uikit';
 
 import {SETTING_KEYS} from '../../../../store/reducers/settings/constants';
+import {useSetting} from '../../../../store/reducers/settings/useSetting';
 import {cn} from '../../../../utils/cn';
-import {useSetting} from '../../../../utils/hooks';
 import i18n from '../i18n';
+
 const b = cn('ydb-query-stopped-banner');
 
 import './QueryStoppedBanner.scss';
 
 export function QueryStoppedBanner() {
-    const [isQueryStoppedBannerClosed, setIsQueryStoppedBannerClosed] = useSetting<boolean>(
-        SETTING_KEYS.QUERY_STOPPED_BANNER_CLOSED,
-    );
+    const {value: isQueryStoppedBannerClosed, saveValue: setIsQueryStoppedBannerClosed} =
+        useSetting<boolean>(SETTING_KEYS.QUERY_STOPPED_BANNER_CLOSED);
 
     const closeBanner = React.useCallback(() => {
         setIsQueryStoppedBannerClosed(true);
diff --git a/src/containers/Tenant/Query/SavedQueries/SavedQueries.tsx b/src/containers/Tenant/Query/SavedQueries/SavedQueries.tsx
index 155ad04ba1..a0adccf721 100644
--- a/src/containers/Tenant/Query/SavedQueries/SavedQueries.tsx
+++ b/src/containers/Tenant/Query/SavedQueries/SavedQueries.tsx
@@ -67,7 +67,7 @@ interface SavedQueriesProps {
 }
 
 export const SavedQueries = ({changeUserInput}: SavedQueriesProps) => {
-    const {filteredSavedQueries, deleteSavedQuery} = useSavedQueries();
+    const {filteredSavedQueries, deleteSavedQuery, isLoading} = useSavedQueries();
     const dispatch = useTypedDispatch();
     const filter = useTypedSelector(selectSavedQueriesFilter);
 
@@ -157,6 +157,7 @@ export const SavedQueries = ({changeUserInput}: SavedQueriesProps) => {
                     <ResizeableDataTable
                         columnsWidthLSKey={SAVED_QUERIES_COLUMNS_WIDTH_LS_KEY}
                         columns={columns}
+                        isLoading={isLoading}
                         data={filteredSavedQueries}
                         settings={QUERY_TABLE_SETTINGS}
                         emptyDataMessage={i18n(filter ? 'history.empty-search' : 'saved.empty')}
diff --git a/src/containers/Tenant/Query/utils/useSavedQueries.tsx b/src/containers/Tenant/Query/utils/useSavedQueries.tsx
index 413b2a1901..d59f09527b 100644
--- a/src/containers/Tenant/Query/utils/useSavedQueries.tsx
+++ b/src/containers/Tenant/Query/utils/useSavedQueries.tsx
@@ -2,11 +2,16 @@ import React from 'react';
 
 import {selectSavedQueriesFilter} from '../../../../store/reducers/queryActions/queryActions';
 import {SETTING_KEYS} from '../../../../store/reducers/settings/constants';
+import {useSetting} from '../../../../store/reducers/settings/useSetting';
 import type {SavedQuery} from '../../../../types/store/query';
-import {useSetting, useTypedSelector} from '../../../../utils/hooks';
+import {useTypedSelector} from '../../../../utils/hooks';
 
 export function useSavedQueries() {
-    const [savedQueries, saveQueries] = useSetting<SavedQuery[]>(SETTING_KEYS.SAVED_QUERIES);
+    const {
+        value: savedQueries,
+        saveValue: saveQueries,
+        isLoading,
+    } = useSetting<SavedQuery[]>(SETTING_KEYS.SAVED_QUERIES);
 
     const filter = useTypedSelector(selectSavedQueriesFilter).trim().toLowerCase();
     const currentInput = useTypedSelector((state) => state.query.input);
@@ -55,7 +60,7 @@ export function useSavedQueries() {
         [savedQueries, saveQueries, currentInput],
     );
 
-    return {savedQueries, filteredSavedQueries, deleteSavedQuery, saveQuery};
+    return {savedQueries, filteredSavedQueries, deleteSavedQuery, saveQuery, isLoading};
 }
 
 function findQueryByName(query: SavedQuery, name: string) {
diff --git a/src/containers/Tenant/TenantNavigation/useTenantNavigation.tsx b/src/containers/Tenant/TenantNavigation/useTenantNavigation.tsx
index f287a137ac..10a0a40862 100644
--- a/src/containers/Tenant/TenantNavigation/useTenantNavigation.tsx
+++ b/src/containers/Tenant/TenantNavigation/useTenantNavigation.tsx
@@ -1,12 +1,15 @@
 import React from 'react';
 
 import {Pulse, Terminal} from '@gravity-ui/icons';
-import {useHistory, useLocation, useRouteMatch} from 'react-router-dom';
+import {useLocation, useRouteMatch} from 'react-router-dom';
+import {StringParam, useQueryParams} from 'use-query-params';
 
 import routes, {getTenantPath, parseQuery} from '../../../routes';
-import {SETTING_KEYS} from '../../../store/reducers/settings/constants';
+import {DEFAULT_USER_SETTINGS, SETTING_KEYS} from '../../../store/reducers/settings/constants';
+import {useSetting} from '../../../store/reducers/settings/useSetting';
 import {TENANT_PAGE, TENANT_PAGES_IDS} from '../../../store/reducers/tenant/constants';
-import {useSetting, useTypedSelector} from '../../../utils/hooks';
+import {tenantPageSchema} from '../../../store/reducers/tenant/types';
+import type {TenantPage} from '../../../store/reducers/tenant/types';
 import i18n from '../i18n';
 
 type TenantPages = keyof typeof TENANT_PAGES_IDS;
@@ -19,14 +22,11 @@ const mapPageToIcon = {
 };
 
 export function useTenantNavigation() {
-    const history = useHistory();
-
     const location = useLocation();
     const queryParams = parseQuery(location);
     const match = useRouteMatch(routes.tenant);
 
-    const [, setInitialTenantPage] = useSetting<string>(SETTING_KEYS.TENANT_INITIAL_PAGE);
-    const {tenantPage} = useTypedSelector((state) => state.tenant);
+    const {tenantPage, handleTenantPageChange} = useTenantPage();
 
     const menuItems = React.useMemo(() => {
         if (!match) {
@@ -44,8 +44,7 @@ export function useTenantNavigation() {
                 path: pagePath,
                 current: tenantPage === pageId,
                 onForward: () => {
-                    setInitialTenantPage(pageId);
-                    history.push(pagePath);
+                    handleTenantPageChange(pageId);
                 },
             };
 
@@ -53,7 +52,56 @@ export function useTenantNavigation() {
         });
 
         return items;
-    }, [tenantPage, setInitialTenantPage, match, history, queryParams]);
+    }, [tenantPage, handleTenantPageChange, match, queryParams]);
 
     return menuItems;
 }
+
+export function useTenantPage() {
+    const [{tenantPage: tenantPageFromQuery}, setQueryParams] = useQueryParams({
+        tenantPage: StringParam,
+    });
+
+    const {value: initialTenantPage, saveValue: setInitialTenantPage} = useSetting<
+        TenantPage | undefined
+    >(SETTING_KEYS.TENANT_INITIAL_PAGE);
+
+    const handleTenantPageChange = React.useCallback(
+        (value?: TenantPage) => {
+            setQueryParams({tenantPage: value});
+            setInitialTenantPage(value);
+        },
+        [setInitialTenantPage, setQueryParams],
+    );
+
+    const parsedInitialPage = React.useMemo(
+        () =>
+            tenantPageSchema
+                .catch(DEFAULT_USER_SETTINGS[SETTING_KEYS.TENANT_INITIAL_PAGE])
+                .parse(initialTenantPage),
+        [initialTenantPage],
+    );
+
+    const tenantPage = React.useMemo(
+        () => tenantPageSchema.catch(parsedInitialPage).parse(tenantPageFromQuery),
+        [tenantPageFromQuery, parsedInitialPage],
+    );
+
+    React.useEffect(() => {
+        try {
+            // Check whether query has valid tenantPage param
+            const parsedQueryPage = tenantPageSchema.parse(tenantPageFromQuery);
+
+            // Save query page as initial if they differ
+            if (parsedQueryPage !== parsedInitialPage) {
+                setInitialTenantPage(parsedQueryPage);
+            }
+        } catch {
+            // If query page is not valid, set saved page to query
+            // `replaceIn` to not create new history entry when applying previously saved tab
+            setQueryParams({tenantPage: parsedInitialPage}, 'replaceIn');
+        }
+    }, [tenantPageFromQuery, parsedInitialPage, setQueryParams, setInitialTenantPage]);
+
+    return {tenantPage, handleTenantPageChange} as const;
+}
diff --git a/src/containers/Tenant/TenantPages.tsx b/src/containers/Tenant/TenantPages.tsx
index d6b0767ae5..5bdea71eed 100644
--- a/src/containers/Tenant/TenantPages.tsx
+++ b/src/containers/Tenant/TenantPages.tsx
@@ -1,4 +1,5 @@
 import {TENANT_SUMMARY_TABS_IDS} from '../../store/reducers/tenant/constants';
+import type {TenantPage} from '../../store/reducers/tenant/types';
 import type {paramSetup} from '../../store/state-url-mapping';
 import type {ExtractType} from '../../types/common';
 
@@ -7,6 +8,7 @@ type TenantQueryParams = {
 };
 
 type AdditionalQueryParams = {
+    tenantPage?: TenantPage;
     database?: string;
     name?: string;
     backend?: string;
diff --git a/src/containers/Tenant/utils/controls.tsx b/src/containers/Tenant/utils/controls.tsx
index 4feccde5d5..f9f3642fcb 100644
--- a/src/containers/Tenant/utils/controls.tsx
+++ b/src/containers/Tenant/utils/controls.tsx
@@ -5,7 +5,8 @@ import type {NavigationTreeNodeType} from 'ydb-ui-components';
 import {api} from '../../../store/reducers/api';
 import {setShowPreview} from '../../../store/reducers/schema/schema';
 import {TENANT_PAGES_IDS, TENANT_QUERY_TABS_ID} from '../../../store/reducers/tenant/constants';
-import {setQueryTab, setTenantPage} from '../../../store/reducers/tenant/tenant';
+import {setQueryTab} from '../../../store/reducers/tenant/tenant';
+import type {TenantPage} from '../../../store/reducers/tenant/types';
 import {EPathSubType} from '../../../types/api/schema';
 import i18n from '../i18n';
 
@@ -15,6 +16,7 @@ import EyeIcon from '@gravity-ui/icons/svgs/eye.svg';
 
 interface ControlsAdditionalEffects {
     setActivePath: (path: string) => void;
+    setTenantPage: (page: TenantPage) => void;
 }
 
 const bindActions = (
@@ -22,13 +24,13 @@ const bindActions = (
     dispatch: React.Dispatch<any>,
     additionalEffects: ControlsAdditionalEffects,
 ) => {
-    const {setActivePath} = additionalEffects;
+    const {setActivePath, setTenantPage} = additionalEffects;
 
     return {
         openPreview: () => {
             dispatch(api.util.invalidateTags(['PreviewData']));
             dispatch(setShowPreview(true));
-            dispatch(setTenantPage(TENANT_PAGES_IDS.query));
+            setTenantPage(TENANT_PAGES_IDS.query);
             dispatch(setQueryTab(TENANT_QUERY_TABS_ID.newQuery));
             setActivePath(path);
         },
diff --git a/src/containers/Tenant/utils/schemaActions.tsx b/src/containers/Tenant/utils/schemaActions.tsx
index 5992f91646..4d790250d4 100644
--- a/src/containers/Tenant/utils/schemaActions.tsx
+++ b/src/containers/Tenant/utils/schemaActions.tsx
@@ -10,7 +10,8 @@ import {
     TENANT_PAGES_IDS,
     TENANT_QUERY_TABS_ID,
 } from '../../../store/reducers/tenant/constants';
-import {setDiagnosticsTab, setQueryTab, setTenantPage} from '../../../store/reducers/tenant/tenant';
+import {setDiagnosticsTab, setQueryTab} from '../../../store/reducers/tenant/tenant';
+import type {TenantPage} from '../../../store/reducers/tenant/types';
 import type {IQueryResult} from '../../../types/store/query';
 import createToast from '../../../utils/createToast';
 import {insertSnippetToEditor} from '../../../utils/monaco/insertSnippet';
@@ -53,6 +54,7 @@ import type {YdbNavigationTreeProps} from './types';
 
 interface ActionsAdditionalParams {
     setActivePath: (path: string) => void;
+    setTenantPage: (page: TenantPage) => void;
     showCreateDirectoryDialog?: (path: string) => void;
     getConfirmation?: () => Promise<boolean>;
     getConnectToDBDialog?: (params: SnippetParams) => Promise<boolean>;
@@ -78,6 +80,7 @@ const bindActions = (
 ) => {
     const {
         setActivePath,
+        setTenantPage,
         showCreateDirectoryDialog,
         getConfirmation,
         getConnectToDBDialog,
@@ -88,7 +91,7 @@ const bindActions = (
     const inputQuery = (tmpl: TemplateFn) => () => {
         const applyInsert = () => {
             //order is important here: firstly we should open query tab and initialize editor (it will be set to window.ydbEditor), after that it is possible to insert snippet
-            dispatch(setTenantPage(TENANT_PAGES_IDS.query));
+            setTenantPage(TENANT_PAGES_IDS.query);
             dispatch(setQueryTab(TENANT_QUERY_TABS_ID.newQuery));
             setActivePath(params.path);
             insertSnippetToEditor(tmpl({...params, schemaData, streamingQueryData}));
@@ -113,7 +116,7 @@ const bindActions = (
             : undefined,
         getConnectToDBDialog: () => getConnectToDBDialog?.({database: params.database}),
         openMonitoring: () => {
-            dispatch(setTenantPage(TENANT_PAGES_IDS.diagnostics));
+            setTenantPage(TENANT_PAGES_IDS.diagnostics);
             dispatch(setDiagnosticsTab(TENANT_DIAGNOSTICS_TABS_IDS.monitoring));
             setActivePath(params.path);
         },
diff --git a/src/containers/Tenants/Tenants.tsx b/src/containers/Tenants/Tenants.tsx
index 7fdf9098f3..3cda62b8cf 100644
--- a/src/containers/Tenants/Tenants.tsx
+++ b/src/containers/Tenants/Tenants.tsx
@@ -22,6 +22,7 @@ import {
     useEditDatabaseFeatureAvailable,
 } from '../../store/reducers/capabilities/hooks';
 import {SETTING_KEYS} from '../../store/reducers/settings/constants';
+import {useSetting} from '../../store/reducers/settings/useSetting';
 import {
     filterTenantsByDomain,
     filterTenantsByProblems,
@@ -40,7 +41,7 @@ import {
     formatNumber,
     formatStorageValuesToGb,
 } from '../../utils/dataFormatters/dataFormatters';
-import {useAutoRefreshInterval, useSetting} from '../../utils/hooks';
+import {useAutoRefreshInterval} from '../../utils/hooks';
 import {useClusterNameFromQuery} from '../../utils/hooks/useDatabaseFromQuery';
 import {isNumeric} from '../../utils/utils';
 
@@ -97,8 +98,10 @@ export const Tenants = ({additionalTenantsProps, scrollContainerRef}: TenantsPro
     const {search, withProblems, handleSearchChange, handleWithProblemsChange} =
         useTenantsQueryParams();
 
-    const [showNetworkUtilization] = useSetting<boolean>(SETTING_KEYS.SHOW_NETWORK_UTILIZATION);
-    const [showDomainDatabase] = useSetting<boolean>(SETTING_KEYS.SHOW_DOMAIN_DATABASE);
+    const {value: showNetworkUtilization} = useSetting<boolean>(
+        SETTING_KEYS.SHOW_NETWORK_UTILIZATION,
+    );
+    const {value: showDomainDatabase} = useSetting<boolean>(SETTING_KEYS.SHOW_DOMAIN_DATABASE);
 
     // We should apply domain filter before other filters
     // It is done to ensure proper entities count
@@ -311,6 +314,7 @@ export const Tenants = ({additionalTenantsProps, scrollContainerRef}: TenantsPro
         return (
             <ResizeableDataTable
                 columnsWidthLSKey={DATABASES_COLUMNS_WIDTH_LS_KEY}
+                isLoading={loading}
                 data={filteredTenants}
                 columns={columns}
                 settings={DEFAULT_TABLE_SETTINGS}
@@ -329,10 +333,9 @@ export const Tenants = ({additionalTenantsProps, scrollContainerRef}: TenantsPro
                 {error ? <ResponseError error={error} /> : null}
                 <TableWithControlsLayout.Table
                     scrollContainerRef={scrollContainerRef}
-                    loading={loading}
                     scrollDependencies={[search, withProblems, sortParams]}
                 >
-                    {currentData ? renderTable() : null}
+                    {renderTable()}
                 </TableWithControlsLayout.Table>
             </TableWithControlsLayout>
         </div>
diff --git a/src/containers/UserSettings/Setting.tsx b/src/containers/UserSettings/Setting.tsx
index de980b0d15..9c837a6ee2 100644
--- a/src/containers/UserSettings/Setting.tsx
+++ b/src/containers/UserSettings/Setting.tsx
@@ -1,6 +1,6 @@
 import {SegmentedRadioGroup, Switch} from '@gravity-ui/uikit';
 
-import {useSetting} from '../../utils/hooks';
+import {useSetting} from '../../store/reducers/settings/useSetting';
 
 export interface SettingsInfoFieldProps {
     type: 'info';
@@ -17,18 +17,11 @@ export interface SettingProps {
     description?: React.ReactNode;
     settingKey: string;
     options?: {value: string; content: string}[];
-    defaultValue?: unknown;
     onValueUpdate?: VoidFunction;
 }
 
-export const Setting = ({
-    type = 'switch',
-    settingKey,
-    options,
-    defaultValue,
-    onValueUpdate,
-}: SettingProps) => {
-    const [settingValue, setValue] = useSetting(settingKey, defaultValue);
+export const Setting = ({type = 'switch', settingKey, options, onValueUpdate}: SettingProps) => {
+    const {value, saveValue: setValue} = useSetting(settingKey);
 
     const onUpdate = (value: unknown) => {
         setValue(value);
@@ -37,7 +30,7 @@ export const Setting = ({
 
     switch (type) {
         case 'switch': {
-            return <Switch checked={Boolean(settingValue)} onUpdate={onUpdate} />;
+            return <Switch checked={Boolean(value)} onUpdate={onUpdate} />;
         }
 
         case 'radio': {
@@ -46,7 +39,7 @@ export const Setting = ({
             }
 
             return (
-                <SegmentedRadioGroup value={String(settingValue)} onUpdate={onUpdate}>
+                <SegmentedRadioGroup value={String(value)} onUpdate={onUpdate}>
                     {options.map(({value, content}) => {
                         return (
                             <SegmentedRadioGroup.Option value={value} key={value}>
diff --git a/src/containers/UserSettings/UserSettings.tsx b/src/containers/UserSettings/UserSettings.tsx
index 858faa8c65..41cc22fbaa 100644
--- a/src/containers/UserSettings/UserSettings.tsx
+++ b/src/containers/UserSettings/UserSettings.tsx
@@ -1,5 +1,13 @@
+import React from 'react';
+
 import {Settings} from '@gravity-ui/navigation';
 import {Text} from '@gravity-ui/uikit';
+import {skipToken} from '@reduxjs/toolkit/query';
+
+import {selectID, selectUser} from '../../store/reducers/authentication/authentication';
+import {settingsApi} from '../../store/reducers/settings/api';
+import {uiFactory} from '../../uiFactory/uiFactory';
+import {useTypedSelector} from '../../utils/hooks';
 
 import {Setting} from './Setting';
 import type {YDBEmbeddedUISettings} from './settings';
@@ -9,8 +17,39 @@ interface UserSettingsProps {
 }
 
 export const UserSettings = ({settings: userSettings}: UserSettingsProps) => {
+    const settingsNames = React.useMemo(() => {
+        const names: string[] = [];
+
+        userSettings.forEach((page) => {
+            page.sections.forEach((section) => {
+                section.settings.forEach((setting) => {
+                    if (setting.type !== 'info') {
+                        names.push(setting.settingKey);
+                    }
+                });
+            });
+        });
+
+        return names;
+    }, [userSettings]);
+
+    const authUserSID = useTypedSelector(selectUser);
+    const anonymosUserId = useTypedSelector(selectID);
+
+    const user = authUserSID || anonymosUserId;
+    const shouldUseMetaSettings = uiFactory.useMetaSettings && user;
+
+    const params = shouldUseMetaSettings
+        ? {
+              name: settingsNames,
+              user,
+          }
+        : skipToken;
+
+    const {isLoading} = settingsApi.useGetSettingsQuery(params);
+
     return (
-        <Settings>
+        <Settings loading={isLoading}>
             {userSettings.map((page) => {
                 const {id, title, icon, sections = [], hideTitle} = page;
 
diff --git a/src/containers/UserSettings/settings.tsx b/src/containers/UserSettings/settings.tsx
index adf5933481..89da177389 100644
--- a/src/containers/UserSettings/settings.tsx
+++ b/src/containers/UserSettings/settings.tsx
@@ -3,7 +3,7 @@ import type {IconProps} from '@gravity-ui/uikit';
 import {createNextState} from '@reduxjs/toolkit';
 
 import {codeAssistBackend} from '../../store';
-import {DEFAULT_USER_SETTINGS, SETTING_KEYS} from '../../store/reducers/settings/constants';
+import {SETTING_KEYS} from '../../store/reducers/settings/constants';
 import {AclSyntax, OLD_BACKEND_CLUSTER_NAMES, PAGE_IDS, SECTION_IDS} from '../../utils/constants';
 import {Lang} from '../../utils/i18n';
 
@@ -66,7 +66,6 @@ export const languageSetting: SettingProps = {
     title: i18n('settings.language.title'),
     type: 'radio',
     options: languageOptions,
-    defaultValue: DEFAULT_USER_SETTINGS[SETTING_KEYS.LANGUAGE],
     onValueUpdate: () => {
         window.location.reload();
     },
diff --git a/src/lib.ts b/src/lib.ts
index c27b38492e..35cf1d650a 100644
--- a/src/lib.ts
+++ b/src/lib.ts
@@ -10,12 +10,12 @@ export {configureStore, rootReducer} from './store';
 export {default as appRoutes} from './routes';
 
 export {YdbEmbeddedAPI} from './services/api';
-export {settingsManager} from './services/settings';
 export {getUserSettings} from './containers/UserSettings/settings';
 export {setSettingValue, getSettingValue} from './store/reducers/settings/settings';
 
 export {componentsRegistry} from './components/ComponentsProvider/componentsRegistry';
-export {useSetting, useTypedSelector} from './utils/hooks';
+export {useSetting} from './store/reducers/settings/useSetting';
+export {useTypedSelector} from './utils/hooks';
 export {getMonitoringLink, getMonitoringClusterLink, parseMonitoringData} from './utils/monitoring';
 export {i18n, Lang, registerKeysets} from './utils/i18n';
 export {toaster} from './utils/createToast';
diff --git a/src/services/api/index.ts b/src/services/api/index.ts
index 37dd66fcea..9ee0083ea7 100644
--- a/src/services/api/index.ts
+++ b/src/services/api/index.ts
@@ -51,9 +51,11 @@ export class YdbEmbeddedAPI {
         withCredentials = false,
         singleClusterMode = true,
         proxyMeta = false,
+        // proxyMeta = true,
         csrfTokenGetter = () => undefined,
         defaults = {},
         useRelativePath = false,
+        // useRelativePath = true,
     }: YdbEmbeddedAPIProps) {
         const axiosParams: AxiosWrapperOptions = {config: {withCredentials, ...defaults}};
         const baseApiParams = {singleClusterMode, proxyMeta, useRelativePath};
diff --git a/src/services/api/metaSettings.ts b/src/services/api/metaSettings.ts
index a8ec9505d4..a5642913e9 100644
--- a/src/services/api/metaSettings.ts
+++ b/src/services/api/metaSettings.ts
@@ -25,7 +25,7 @@ export class MetaSettingsAPI extends BaseMetaAPI {
         preventBatching,
     }: GetSingleSettingParams & {preventBatching?: boolean}) {
         if (preventBatching) {
-            return this.get<Setting>(this.getPath('/meta/user_settings'), {name, user});
+            return this.get<Setting | undefined>(this.getPath('/meta/user_settings'), {name, user});
         }
 
         return new Promise<Setting>((resolve, reject) => {
diff --git a/src/store/configureStore.ts b/src/store/configureStore.ts
index c29d078f3e..b72d1d10a0 100644
--- a/src/store/configureStore.ts
+++ b/src/store/configureStore.ts
@@ -9,7 +9,6 @@ import {YdbEmbeddedAPI} from '../services/api';
 import {getUrlData} from './getUrlData';
 import rootReducer from './reducers';
 import {api as storeApi} from './reducers/api';
-import {syncUserSettingsFromLS} from './reducers/settings/settings';
 import {UPDATE_REF} from './reducers/tooltip';
 import getLocationMiddleware from './state-url-mapping';
 
@@ -45,8 +44,6 @@ function _configureStore<
             }).concat(locationMiddleware, ...middleware),
     });
 
-    syncUserSettingsFromLS(store);
-
     return store;
 }
 
diff --git a/src/store/reducers/authentication/authentication.ts b/src/store/reducers/authentication/authentication.ts
index f8b1ecd9a7..d2d083a85a 100644
--- a/src/store/reducers/authentication/authentication.ts
+++ b/src/store/reducers/authentication/authentication.ts
@@ -33,6 +33,11 @@ export const slice = createSlice({
             state.user = AuthType === 'Login' ? UserSID : undefined;
             state.id = UserID;
 
+            // TODO: test, remove after
+            // state.user = 'root';
+            // state.id = 'root';
+            // TODO: test, remove after
+
             // If ydb version supports this feature,
             // There should be explicit flag in whoami response
             // Otherwise every user is allowed to make changes
diff --git a/src/store/reducers/query/__test__/tabPersistence.test.tsx b/src/store/reducers/query/__test__/tabPersistence.test.tsx
index d04a1f3026..b8bb2829e6 100644
--- a/src/store/reducers/query/__test__/tabPersistence.test.tsx
+++ b/src/store/reducers/query/__test__/tabPersistence.test.tsx
@@ -4,10 +4,6 @@ import type {QueryState} from '../types';
 describe('QueryResultViewer tab persistence integration', () => {
     const initialState: QueryState = {
         input: '',
-        history: {
-            queries: [],
-            currentIndex: -1,
-        },
     };
 
     test('should save and retrieve tab selection for explain queries', () => {
diff --git a/src/store/reducers/query/query.ts b/src/store/reducers/query/query.ts
index 6895c4a423..99dfed1dde 100644
--- a/src/store/reducers/query/query.ts
+++ b/src/store/reducers/query/query.ts
@@ -1,7 +1,6 @@
 import {createSelector, createSlice} from '@reduxjs/toolkit';
 import type {PayloadAction} from '@reduxjs/toolkit';
 
-import {settingsManager} from '../../../services/settings';
 import {TracingLevelNumber} from '../../../types/api/query';
 import type {QueryAction, QueryRequestParams, QuerySettings} from '../../../types/store/query';
 import type {StreamDataChunk} from '../../../types/store/streaming';
@@ -11,7 +10,6 @@ import {isQueryErrorResponse} from '../../../utils/query';
 import {isNumeric} from '../../../utils/utils';
 import type {RootState} from '../../defaultStore';
 import {api} from '../api';
-import {SETTING_KEYS} from '../settings/constants';
 
 import {prepareQueryData} from './prepareQueryData';
 import {
@@ -19,17 +17,8 @@ import {
     setStreamQueryResponse as setStreamQueryResponseReducer,
     setStreamSession as setStreamSessionReducer,
 } from './streamingReducers';
-import type {QueryResult, QueryState} from './types';
-import {getActionAndSyntaxFromQueryMode, getQueryInHistory, prepareQueryWithPragmas} from './utils';
-
-const MAXIMUM_QUERIES_IN_HISTORY = 20;
-
-const queriesHistoryInitial = settingsManager.readUserSettingsValue(
-    SETTING_KEYS.QUERIES_HISTORY,
-    [],
-) as string[];
-
-const sliceLimit = queriesHistoryInitial.length - MAXIMUM_QUERIES_IN_HISTORY;
+import type {QueryResult, QueryState, QueryStats} from './types';
+import {getActionAndSyntaxFromQueryMode, prepareQueryWithPragmas} from './utils';
 
 const rawQuery = loadFromSessionStorage(QUERY_EDITOR_CURRENT_QUERY_KEY);
 const input = typeof rawQuery === 'string' ? rawQuery : '';
@@ -39,16 +28,7 @@ const isDirty = Boolean(loadFromSessionStorage(QUERY_EDITOR_DIRTY_KEY));
 const initialState: QueryState = {
     input,
     isDirty,
-    history: {
-        queries: queriesHistoryInitial
-            .slice(sliceLimit < 0 ? 0 : sliceLimit)
-            .map(getQueryInHistory),
-        currentIndex:
-            queriesHistoryInitial.length > MAXIMUM_QUERIES_IN_HISTORY
-                ? MAXIMUM_QUERIES_IN_HISTORY - 1
-                : queriesHistoryInitial.length - 1,
-        filter: '',
-    },
+    historyFilter: '',
 };
 
 const slice = createSlice({
@@ -66,76 +46,11 @@ const slice = createSlice({
         setQueryResult: (state, action: PayloadAction<QueryResult | undefined>) => {
             state.result = action.payload;
         },
-        saveQueryToHistory: (
-            state,
-            action: PayloadAction<{queryText: string; queryId: string}>,
-        ) => {
-            const {queryText, queryId} = action.payload;
-
-            const newQueries = [...state.history.queries, {queryText, queryId}].slice(
-                state.history.queries.length >= MAXIMUM_QUERIES_IN_HISTORY ? 1 : 0,
-            );
-            settingsManager.setUserSettingsValue(SETTING_KEYS.QUERIES_HISTORY, newQueries);
-            const currentIndex = newQueries.length - 1;
-
-            state.history = {
-                queries: newQueries,
-                currentIndex,
-            };
-        },
-        updateQueryInHistory: (
-            state,
-            action: PayloadAction<{queryId: string; stats: QueryStats}>,
-        ) => {
-            const {queryId, stats} = action.payload;
-
-            if (!stats) {
-                return;
-            }
-
-            const index = state.history.queries.findIndex((item) => item.queryId === queryId);
-
-            if (index === -1) {
-                return;
-            }
-
-            const newQueries = [...state.history.queries];
-            const {durationUs, endTime} = stats;
-            newQueries.splice(index, 1, {
-                ...state.history.queries[index],
-                durationUs,
-                endTime,
-            });
-
-            settingsManager.setUserSettingsValue(SETTING_KEYS.QUERIES_HISTORY, newQueries);
-
-            state.history.queries = newQueries;
-        },
-        goToPreviousQuery: (state) => {
-            const currentIndex = state.history.currentIndex;
-            if (currentIndex <= 0) {
-                return;
-            }
-            const newCurrentIndex = currentIndex - 1;
-            const query = state.history.queries[newCurrentIndex];
-            state.input = query.queryText;
-            state.history.currentIndex = newCurrentIndex;
-        },
-        goToNextQuery: (state) => {
-            const currentIndex = state.history.currentIndex;
-            if (currentIndex >= state.history.queries.length - 1) {
-                return;
-            }
-            const newCurrentIndex = currentIndex + 1;
-            const query = state.history.queries[newCurrentIndex];
-            state.input = query.queryText;
-            state.history.currentIndex = newCurrentIndex;
-        },
         setTenantPath: (state, action: PayloadAction<string>) => {
             state.tenantPath = action.payload;
         },
         setQueryHistoryFilter: (state, action: PayloadAction<string>) => {
-            state.history.filter = action.payload;
+            state.historyFilter = action.payload;
         },
         setResultTab: (
             state,
@@ -152,14 +67,13 @@ const slice = createSlice({
         setStreamQueryResponse: setStreamQueryResponseReducer,
     },
     selectors: {
-        selectQueriesHistoryFilter: (state) => state.history.filter || '',
+        selectQueriesHistoryFilter: (state) => state.historyFilter || '',
         selectTenantPath: (state) => state.tenantPath,
         selectResult: (state) => state.result,
         selectStartTime: (state) => state.result?.startTime,
         selectEndTime: (state) => state.result?.endTime,
         selectUserInput: (state) => state.input,
         selectIsDirty: (state) => state.isDirty,
-        selectQueriesHistoryCurrentIndex: (state) => state.history?.currentIndex,
         selectResultTab: (state) => state.selectedResultTab,
     },
 });
@@ -175,27 +89,10 @@ export const selectQueryDuration = createSelector(
     },
 );
 
-export const selectQueriesHistory = createSelector(
-    [
-        (state: RootState) => state.query.history.queries,
-        (state: RootState) => state.query.history.filter,
-    ],
-    (queries, filter) => {
-        const normalizedFilter = filter?.toLowerCase();
-        return normalizedFilter
-            ? queries.filter((item) => item.queryText.toLowerCase().includes(normalizedFilter))
-            : queries;
-    },
-);
-
 export default slice.reducer;
 export const {
     changeUserInput,
     setQueryResult,
-    saveQueryToHistory,
-    updateQueryInHistory,
-    goToPreviousQuery,
-    goToNextQuery,
     setTenantPath,
     setQueryHistoryFilter,
     addStreamingChunks,
@@ -207,7 +104,6 @@ export const {
 
 export const {
     selectQueriesHistoryFilter,
-    selectQueriesHistoryCurrentIndex,
     selectTenantPath,
     selectResult,
     selectUserInput,
@@ -228,11 +124,6 @@ interface SendQueryParams extends QueryRequestParams {
 // Stream query receives queryId from session chunk.
 type StreamQueryParams = Omit<SendQueryParams, 'queryId'>;
 
-interface QueryStats {
-    durationUs?: string | number;
-    endTime?: string | number;
-}
-
 const DEFAULT_STREAM_CHUNK_SIZE = 1000;
 const DEFAULT_CONCURRENT_RESULTS = false;
 
@@ -345,7 +236,7 @@ export const queryApi = api.injectEndpoints({
                 }
             },
         }),
-        useSendQuery: build.mutation({
+        useSendQuery: build.mutation<{queryStats: QueryStats; queryId: string}, SendQueryParams>({
             queryFn: async (
                 {
                     actionType = 'execute',
@@ -355,7 +246,7 @@ export const queryApi = api.injectEndpoints({
                     enableTracingLevel,
                     queryId,
                     base64,
-                }: SendQueryParams,
+                },
                 {signal, dispatch, getState},
             ) => {
                 const startTime = Date.now();
@@ -421,8 +312,9 @@ export const queryApi = api.injectEndpoints({
                     const data = prepareQueryData(response);
                     data.traceId = response?._meta?.traceId;
 
+                    const queryStats: QueryStats = {};
+
                     if (actionType === 'execute') {
-                        const queryStats: QueryStats = {};
                         if (data.stats) {
                             const {DurationUs, Executions: [{FinishTimeMs}] = [{}]} = data.stats;
                             queryStats.durationUs = DurationUs;
@@ -432,8 +324,6 @@ export const queryApi = api.injectEndpoints({
                             queryStats.durationUs = (now - timeStart) * 1000;
                             queryStats.endTime = now;
                         }
-
-                        dispatch(updateQueryInHistory({stats: queryStats, queryId}));
                     }
 
                     dispatch(
@@ -446,7 +336,7 @@ export const queryApi = api.injectEndpoints({
                             endTime: Date.now(),
                         }),
                     );
-                    return {data: null};
+                    return {data: {queryStats, queryId}};
                 } catch (error) {
                     const state = getState() as RootState;
                     if (state.query.result?.startTime !== startTime) {
diff --git a/src/store/reducers/query/types.ts b/src/store/reducers/query/types.ts
index 9d753b5210..e7975ab1eb 100644
--- a/src/store/reducers/query/types.ts
+++ b/src/store/reducers/query/types.ts
@@ -62,14 +62,15 @@ export interface QueryState {
     input: string;
     result?: QueryResult;
     isDirty?: boolean;
-    history: {
-        queries: QueryInHistory[];
-        currentIndex: number;
-        filter?: string;
-    };
+    historyFilter?: string;
     tenantPath?: string;
     selectedResultTab?: {
         execute?: string;
         explain?: string;
     };
 }
+
+export interface QueryStats {
+    durationUs?: string | number;
+    endTime?: string | number;
+}
diff --git a/src/store/reducers/query/useQueriesHistory.ts b/src/store/reducers/query/useQueriesHistory.ts
new file mode 100644
index 0000000000..16842a3067
--- /dev/null
+++ b/src/store/reducers/query/useQueriesHistory.ts
@@ -0,0 +1,124 @@
+import React from 'react';
+
+import {useEventHandler, useTypedDispatch, useTypedSelector} from '../../../utils/hooks';
+import {SETTING_KEYS} from '../settings/constants';
+import {useSetting} from '../settings/useSetting';
+
+import {changeUserInput, selectQueriesHistoryFilter} from './query';
+import type {QueryInHistory, QueryStats} from './types';
+import {getQueryInHistory} from './utils';
+
+const MAXIMUM_QUERIES_IN_HISTORY = 20;
+
+export function useQueriesHistory() {
+    const dispatch = useTypedDispatch();
+    const queriesFilter = useTypedSelector(selectQueriesHistoryFilter);
+
+    const {
+        value: savedHistoryQueries,
+        saveValue: saveHistoryQueries,
+        isLoading,
+    } = useSetting<QueryInHistory[]>(SETTING_KEYS.QUERIES_HISTORY);
+
+    const [historyQueries, setQueries] = React.useState<QueryInHistory[]>([]);
+    const [historyCurrentIndex, setCurrentIndex] = React.useState(-1);
+
+    React.useEffect(() => {
+        if (!savedHistoryQueries || savedHistoryQueries.length === 0) {
+            setQueries([]);
+            setCurrentIndex(-1);
+        } else {
+            const sliceLimit = savedHistoryQueries.length - MAXIMUM_QUERIES_IN_HISTORY;
+
+            const preparedQueries = savedHistoryQueries
+                .slice(sliceLimit < 0 ? 0 : sliceLimit)
+                .map(getQueryInHistory);
+
+            setQueries(preparedQueries);
+            setCurrentIndex(preparedQueries.length - 1);
+        }
+    }, [savedHistoryQueries]);
+
+    const filteredHistoryQueries = React.useMemo(() => {
+        const normalizedFilter = queriesFilter?.toLowerCase();
+        return normalizedFilter
+            ? historyQueries.filter((item) =>
+                  item.queryText.toLowerCase().includes(normalizedFilter),
+              )
+            : historyQueries;
+    }, [historyQueries, queriesFilter]);
+
+    // These functions are used inside Monaco editorDidMount
+    // They should be stable to work properly
+    const goToPreviousQuery = useEventHandler(() => {
+        setCurrentIndex((index) => {
+            if (historyQueries.length > 0 && index > 0) {
+                const newIndex = index - 1;
+                const query = historyQueries[newIndex];
+
+                if (query) {
+                    dispatch(changeUserInput({input: query.queryText}));
+                    return newIndex;
+                }
+            }
+            return index;
+        });
+    });
+
+    const goToNextQuery = useEventHandler(() => {
+        setCurrentIndex((index) => {
+            if (historyQueries.length > 0 && index < historyQueries.length - 1) {
+                const newIndex = index + 1;
+                const query = historyQueries[newIndex];
+                if (query) {
+                    dispatch(changeUserInput({input: query.queryText}));
+                    return newIndex;
+                }
+            }
+
+            return index;
+        });
+    });
+
+    const saveQueryToHistory = useEventHandler((queryText: string, queryId: string) => {
+        const newQueries = [...historyQueries, {queryText, queryId}].slice(
+            historyQueries.length >= MAXIMUM_QUERIES_IN_HISTORY ? 1 : 0,
+        );
+        saveHistoryQueries(newQueries);
+        setQueries(newQueries);
+        // Update currentIndex to point to the newly added query
+        const newCurrentIndex = newQueries.length - 1;
+        setCurrentIndex(newCurrentIndex);
+    });
+
+    const updateQueryInHistory = useEventHandler((queryId: string, stats: QueryStats) => {
+        if (!stats || !historyQueries.length) {
+            return;
+        }
+
+        const index = historyQueries.findIndex((item) => item.queryId === queryId);
+
+        if (index !== -1) {
+            const newQueries = [...historyQueries];
+            const {durationUs, endTime} = stats;
+            newQueries.splice(index, 1, {
+                ...historyQueries[index],
+                durationUs,
+                endTime,
+            });
+            saveHistoryQueries(newQueries);
+            setQueries(newQueries);
+        }
+    });
+
+    return {
+        historyQueries,
+        historyCurrentIndex,
+        filteredHistoryQueries,
+        goToPreviousQuery,
+        goToNextQuery,
+        saveQueryToHistory,
+        updateQueryInHistory,
+        isLoading,
+    };
+}
diff --git a/src/store/reducers/settings/api.ts b/src/store/reducers/settings/api.ts
index f4595de3c6..c52c105cbc 100644
--- a/src/store/reducers/settings/api.ts
+++ b/src/store/reducers/settings/api.ts
@@ -6,19 +6,34 @@ import type {
     SetSingleSettingParams,
     Setting,
 } from '../../../types/api/settings';
-import type {AppDispatch} from '../../defaultStore';
+import type {AppDispatch, RootState} from '../../defaultStore';
 import {api} from '../api';
 
 import {SETTINGS_OPTIONS} from './constants';
+import {getSettingValue, setSettingValue} from './settings';
+import {
+    getSettingDefault,
+    parseSettingValue,
+    readSettingValueFromLS,
+    setSettingValueToLS,
+    shouldSyncSettingToLS,
+    stringifySettingValue,
+} from './utils';
+
+const invalidParamsError =
+    'Missing required parameters (name, user) or MetaSettings API is not available';
 
 export const settingsApi = api.injectEndpoints({
     endpoints: (builder) => ({
-        getSingleSetting: builder.query({
-            queryFn: async ({name, user}: GetSingleSettingParams, baseApi) => {
+        getSingleSetting: builder.query<Setting | undefined, Partial<GetSingleSettingParams>>({
+            queryFn: async ({name, user}) => {
                 try {
-                    if (!window.api.metaSettings) {
-                        throw new Error('MetaSettings API is not available');
+                    // In this case localStorage should be used for settings
+                    // Actual value will be loaded to store in onQueryStarted
+                    if (!name || !user || !window.api.metaSettings) {
+                        throw new Error(invalidParamsError);
                     }
+
                     const data = await window.api.metaSettings.getSingleSetting({
                         name,
                         user,
@@ -26,25 +41,70 @@ export const settingsApi = api.injectEndpoints({
                         preventBatching: SETTINGS_OPTIONS[name]?.preventBatching,
                     });
 
-                    const dispatch = baseApi.dispatch as AppDispatch;
-
-                    // Try to sync local value if there is no backend value
-                    syncLocalValueToMetaIfNoData(data, dispatch);
-
                     return {data};
                 } catch (error) {
                     return {error};
                 }
             },
+            async onQueryStarted(args, {dispatch, queryFulfilled}) {
+                const {name, user} = args;
+
+                if (!name) {
+                    return;
+                }
+
+                const shouldUseLocalSettings =
+                    !user || !window.api.metaSettings || shouldSyncSettingToLS(name);
+
+                const defaultValue = getSettingDefault(name);
+
+                // Preload value from LS or default to store
+                if (shouldUseLocalSettings) {
+                    const savedValue = readSettingValueFromLS(name);
+                    const value = savedValue ?? defaultValue;
+
+                    dispatch(setSettingValue(name, value));
+                } else {
+                    dispatch(setSettingValue(name, defaultValue));
+                }
+
+                try {
+                    const {data} = await queryFulfilled;
+
+                    // Load api value to store if present
+                    // In case local storage should be used
+                    // query will finish with an error and this code will not run
+                    const parsedValue = parseSettingValue(data?.value);
+
+                    if (isNil(data?.value)) {
+                        // Try to sync local value if there is no backend value
+                        syncLocalValueToMetaIfNoData({...data}, dispatch);
+                    } else {
+                        dispatch(setSettingValue(name, parsedValue));
+
+                        if (shouldSyncSettingToLS(name)) {
+                            setSettingValueToLS(name, data.value);
+                        }
+                    }
+                } catch {}
+            },
         }),
         setSingleSetting: builder.mutation({
-            queryFn: async (params: SetSingleSettingParams) => {
+            queryFn: async ({
+                name,
+                user,
+                value,
+            }: Partial<Omit<SetSingleSettingParams, 'value'>> & {value: unknown}) => {
                 try {
-                    if (!window.api.metaSettings) {
-                        throw new Error('MetaSettings API is not available');
+                    if (!name || !user || !window.api.metaSettings) {
+                        throw new Error(invalidParamsError);
                     }
 
-                    const data = await window.api.metaSettings.setSingleSetting(params);
+                    const data = await window.api.metaSettings.setSingleSetting({
+                        name,
+                        user,
+                        value: stringifySettingValue(value),
+                    });
 
                     if (data.status !== 'SUCCESS') {
                         throw new Error('Setting status is not SUCCESS');
@@ -55,34 +115,51 @@ export const settingsApi = api.injectEndpoints({
                     return {error};
                 }
             },
-            async onQueryStarted(args, {dispatch, queryFulfilled}) {
+            async onQueryStarted(args, {dispatch, queryFulfilled, getState}) {
                 const {name, user, value} = args;
 
-                // Optimistically update existing cache entry
-                const patchResult = dispatch(
-                    settingsApi.util.updateQueryData('getSingleSetting', {name, user}, (draft) => {
-                        return {...draft, name, user, value};
-                    }),
-                );
+                if (!name) {
+                    return;
+                }
+
+                // Extract previous value to revert to it if set is not succesfull
+                const previousSettingValue = getSettingValue(getState() as RootState, name);
+
+                // Optimistically update store
+                dispatch(setSettingValue(name, value));
+
+                // If local storage settings should be used
+                // Update LS and do not do any further code
+                if (!user || !window.api.metaSettings) {
+                    setSettingValueToLS(name, value);
+                    return;
+                }
+
                 try {
                     await queryFulfilled;
+
+                    // If mutation is successful, we can store new value in LS
+                    if (shouldSyncSettingToLS(name)) {
+                        setSettingValueToLS(name, value);
+                    }
                 } catch {
-                    patchResult.undo();
+                    // Set previous value to store in case of error
+                    dispatch(setSettingValue(name, previousSettingValue));
                 }
             },
         }),
         getSettings: builder.query({
-            queryFn: async ({name, user}: GetSettingsParams, baseApi) => {
+            queryFn: async ({name, user}: Partial<GetSettingsParams>, baseApi) => {
                 try {
-                    if (!window.api.metaSettings) {
-                        throw new Error('MetaSettings API is not available');
+                    if (!window.api.metaSettings || !name || !user) {
+                        throw new Error(invalidParamsError);
                     }
                     const data = await window.api.metaSettings.getSettings({name, user});
 
-                    const patches: Promise<void>[] = [];
+                    const patches: Promise<unknown>[] = [];
                     const dispatch = baseApi.dispatch as AppDispatch;
 
-                    // Upsert received data in getSingleSetting cache
+                    // Upsert received data in getSingleSetting cache to prevent further redundant requests
                     name.forEach((settingName) => {
                         const settingData = data[settingName] ?? {};
 
@@ -98,15 +175,18 @@ export const settingsApi = api.injectEndpoints({
                                 cacheEntryParams,
                                 newValue,
                             ),
-                        ).then(() => {
+                        );
+                        if (isNil(settingData.value)) {
                             // Try to sync local value if there is no backend value
-                            // Do it after upsert if finished to ensure proper values update order
-                            // 1. New entry added to cache with nil value
-                            // 2. Positive entry update - local storage value replace nil in cache
-                            // 3.1. Set is successful, local value in cache
-                            // 3.2. Set is not successful, cache value reverted to previous nil
                             syncLocalValueToMetaIfNoData(settingData, dispatch);
-                        });
+                        } else {
+                            const parsedValue = parseSettingValue(settingData.value);
+                            dispatch(setSettingValue(settingName, parsedValue));
+
+                            if (shouldSyncSettingToLS(settingName)) {
+                                setSettingValueToLS(settingName, settingData.value);
+                            }
+                        }
 
                         patches.push(patch);
                     });
@@ -124,7 +204,11 @@ export const settingsApi = api.injectEndpoints({
     overrideExisting: 'throw',
 });
 
-function syncLocalValueToMetaIfNoData(params: Setting, dispatch: AppDispatch) {
+function syncLocalValueToMetaIfNoData(params: Partial<Setting>, dispatch: AppDispatch) {
+    if (!params.name) {
+        return;
+    }
+
     const localValue = localStorage.getItem(params.name);
 
     if (isNil(params.value) && !isNil(localValue)) {
diff --git a/src/store/reducers/settings/constants.ts b/src/store/reducers/settings/constants.ts
index cbc1c8bed4..cd4026fc93 100644
--- a/src/store/reducers/settings/constants.ts
+++ b/src/store/reducers/settings/constants.ts
@@ -73,7 +73,7 @@ export const DEFAULT_USER_SETTINGS = {
     [SETTING_KEYS.ACL_SYNTAX]: AclSyntax.YdbShort,
 } as const satisfies Record<SettingKey, unknown>;
 
-export const SETTINGS_OPTIONS: Record<string, SettingOptions> = {
+export const SETTINGS_OPTIONS: Record<string, SettingOptions | undefined> = {
     [SETTING_KEYS.THEME]: {
         preventBatching: true,
     },
diff --git a/src/store/reducers/settings/settings.ts b/src/store/reducers/settings/settings.ts
index 4267f8fde2..98a2e85b62 100644
--- a/src/store/reducers/settings/settings.ts
+++ b/src/store/reducers/settings/settings.ts
@@ -1,19 +1,18 @@
 import type {Store} from '@reduxjs/toolkit';
-import {createSlice} from '@reduxjs/toolkit';
+import {createSelector, createSlice} from '@reduxjs/toolkit';
+import {isNil} from 'lodash';
 
-import {settingsManager} from '../../../services/settings';
 import {parseJson} from '../../../utils/utils';
-import type {AppDispatch} from '../../defaultStore';
+import type {AppDispatch, RootState} from '../../defaultStore';
 
-import {DEFAULT_USER_SETTINGS} from './constants';
+import type {SettingKey} from './constants';
+import {DEFAULT_USER_SETTINGS, SETTINGS_OPTIONS} from './constants';
 import type {SettingsState} from './types';
-
-const userSettings = settingsManager.extractSettingsFromLS(DEFAULT_USER_SETTINGS);
-const systemSettings = window.systemSettings || {};
+import {readSettingValueFromLS} from './utils';
 
 export const initialState: SettingsState = {
-    userSettings,
-    systemSettings,
+    userSettings: {},
+    systemSettings: window.systemSettings || {},
 };
 
 const settingsSlice = createSlice({
@@ -24,18 +23,36 @@ const settingsSlice = createSlice({
             state.userSettings[action.payload.name] = action.payload.value;
         }),
     }),
-    selectors: {
-        getSettingValue: (state, name?: string) => {
-            if (!name) {
-                return undefined;
-            }
-
-            return state.userSettings[name];
-        },
-    },
 });
 
-export const {getSettingValue} = settingsSlice.selectors;
+export const getSettingValue = createSelector(
+    (state: RootState) => state.settings.userSettings,
+    (_state: RootState, name?: string) => name,
+    (userSettings, name) => {
+        if (!name) {
+            return undefined;
+        }
+
+        const storeValue = userSettings[name];
+
+        if (!isNil(storeValue)) {
+            return storeValue;
+        }
+
+        const defaultValue = DEFAULT_USER_SETTINGS[name as SettingKey] as unknown;
+
+        // Do not load LS value from always sync values.
+        // In case there is no settings service
+        // Such setting will be loaded from LS with getSingleSetting
+        if (SETTINGS_OPTIONS[name]?.preventSyncWithLS) {
+            return defaultValue;
+        }
+
+        const savedValue = readSettingValueFromLS(name);
+
+        return savedValue;
+    },
+);
 
 export const setSettingValue = (name: string | undefined, value: unknown) => {
     return (dispatch: AppDispatch) => {
diff --git a/src/store/reducers/settings/useSetting.ts b/src/store/reducers/settings/useSetting.ts
index 4a51f3a7e4..c5b2d7ce27 100644
--- a/src/store/reducers/settings/useSetting.ts
+++ b/src/store/reducers/settings/useSetting.ts
@@ -1,22 +1,10 @@
 import React from 'react';
 
-import {skipToken} from '@reduxjs/toolkit/query';
-
-import {uiFactory} from '../../../uiFactory/uiFactory';
-import {useTypedDispatch} from '../../../utils/hooks/useTypedDispatch';
 import {useTypedSelector} from '../../../utils/hooks/useTypedSelector';
 import {selectID, selectUser} from '../authentication/authentication';
 
 import {settingsApi} from './api';
-import type {SettingKey} from './constants';
-import {DEFAULT_USER_SETTINGS, SETTINGS_OPTIONS} from './constants';
-import {getSettingValue, setSettingValue} from './settings';
-import {
-    parseSettingValue,
-    readSettingValueFromLS,
-    setSettingValueToLS,
-    stringifySettingValue,
-} from './utils';
+import {getSettingValue} from './settings';
 
 type SaveSettingValue<T> = (value: T | undefined) => void;
 
@@ -25,70 +13,21 @@ export function useSetting<T>(name?: string): {
     saveValue: SaveSettingValue<T>;
     isLoading: boolean;
 } {
-    const dispatch = useTypedDispatch();
-
-    const preventSyncWithLS = Boolean(name && SETTINGS_OPTIONS[name]?.preventSyncWithLS);
-
     const settingValue = useTypedSelector((state) => getSettingValue(state, name)) as T | undefined;
 
     const authUserSID = useTypedSelector(selectUser);
     const anonymousUserId = useTypedSelector(selectID);
-
     const user = authUserSID || anonymousUserId;
-    const shouldUseMetaSettings = uiFactory.useMetaSettings && user && name;
-
-    const shouldUseOnlyExternalSettings = shouldUseMetaSettings && preventSyncWithLS;
-
-    const params = React.useMemo(() => {
-        return shouldUseMetaSettings ? {user, name} : skipToken;
-    }, [shouldUseMetaSettings, user, name]);
 
-    const {currentData: metaSetting, isLoading: isSettingLoading} =
-        settingsApi.useGetSingleSettingQuery(params);
+    const {isLoading} = settingsApi.useGetSingleSettingQuery({user, name});
 
     const [setMetaSetting] = settingsApi.useSetSingleSettingMutation();
 
-    // Add loading state to settings that are stored externally
-    const isLoading = shouldUseMetaSettings ? isSettingLoading : false;
-
-    // Load initial value
-    React.useEffect(() => {
-        let value = name ? (DEFAULT_USER_SETTINGS[name as SettingKey] as T | undefined) : undefined;
-
-        if (!shouldUseOnlyExternalSettings) {
-            const savedValue = readSettingValueFromLS<T>(name);
-            value = savedValue ?? value;
-        }
-
-        dispatch(setSettingValue(name, value));
-    }, [name, shouldUseOnlyExternalSettings, dispatch]);
-
-    // Sync value from backend with LS and store
-    React.useEffect(() => {
-        if (shouldUseMetaSettings && metaSetting?.value) {
-            if (!shouldUseOnlyExternalSettings) {
-                setSettingValueToLS(name, metaSetting.value);
-            }
-            const parsedValue = parseSettingValue<T>(metaSetting.value);
-            dispatch(setSettingValue(name, parsedValue));
-        }
-    }, [shouldUseMetaSettings, shouldUseOnlyExternalSettings, metaSetting, name, dispatch]);
-
     const saveValue = React.useCallback<SaveSettingValue<T>>(
         (value) => {
-            if (shouldUseMetaSettings) {
-                setMetaSetting({
-                    user,
-                    name: name,
-                    value: stringifySettingValue(value),
-                });
-            }
-
-            if (!shouldUseOnlyExternalSettings) {
-                setSettingValueToLS(name, value);
-            }
+            setMetaSetting({user, name: name, value: value});
         },
-        [shouldUseMetaSettings, shouldUseOnlyExternalSettings, user, name, setMetaSetting],
+        [user, name, setMetaSetting],
     );
 
     return {value: settingValue, saveValue, isLoading} as const;
diff --git a/src/store/reducers/settings/utils.ts b/src/store/reducers/settings/utils.ts
index 916e1e5d42..601a176c12 100644
--- a/src/store/reducers/settings/utils.ts
+++ b/src/store/reducers/settings/utils.ts
@@ -1,6 +1,9 @@
 import type {SettingValue} from '../../../types/api/settings';
 import {parseJson} from '../../../utils/utils';
 
+import type {SettingKey} from './constants';
+import {DEFAULT_USER_SETTINGS, SETTINGS_OPTIONS} from './constants';
+
 export function stringifySettingValue<T>(value?: T): string {
     return typeof value === 'string' ? value : JSON.stringify(value);
 }
@@ -34,3 +37,9 @@ export function setSettingValueToLS(name: string | undefined, value: unknown): v
         localStorage.setItem(name, preparedValue);
     } catch {}
 }
+export function getSettingDefault(name: string) {
+    return DEFAULT_USER_SETTINGS[name as SettingKey];
+}
+export function shouldSyncSettingToLS(name: string) {
+    return !SETTINGS_OPTIONS[name]?.preventSyncWithLS;
+}
diff --git a/src/store/reducers/tenant/tenant.ts b/src/store/reducers/tenant/tenant.ts
index 26347c36bf..1f1aaba8df 100644
--- a/src/store/reducers/tenant/tenant.ts
+++ b/src/store/reducers/tenant/tenant.ts
@@ -1,31 +1,22 @@
 import {createSlice} from '@reduxjs/toolkit';
 import type {PayloadAction} from '@reduxjs/toolkit';
 
-import {settingsManager} from '../../../services/settings';
 import type {TTenantInfo} from '../../../types/api/tenant';
 import {useClusterNameFromQuery} from '../../../utils/hooks/useDatabaseFromQuery';
 import {api} from '../api';
 import {useDatabasesAvailable} from '../capabilities/hooks';
-import {DEFAULT_USER_SETTINGS, SETTING_KEYS} from '../settings/constants';
 import {prepareTenants} from '../tenants/utils';
 
 import {TENANT_DIAGNOSTICS_TABS_IDS, TENANT_METRICS_TABS_IDS} from './constants';
-import {tenantPageSchema} from './types';
 import type {
     TenantDiagnosticsTab,
     TenantMetricsTab,
-    TenantPage,
     TenantQueryTab,
     TenantState,
     TenantSummaryTab,
 } from './types';
 
-const tenantPage = tenantPageSchema
-    .catch(DEFAULT_USER_SETTINGS[SETTING_KEYS.TENANT_INITIAL_PAGE])
-    .parse(settingsManager.readUserSettingsValue(SETTING_KEYS.TENANT_INITIAL_PAGE));
-
 export const initialState: TenantState = {
-    tenantPage,
     metricsTab: TENANT_METRICS_TABS_IDS.cpu,
     diagnosticsTab: TENANT_DIAGNOSTICS_TABS_IDS.overview,
 };
@@ -34,9 +25,6 @@ const slice = createSlice({
     name: 'tenant',
     initialState,
     reducers: {
-        setTenantPage: (state, action: PayloadAction<TenantPage>) => {
-            state.tenantPage = action.payload;
-        },
         setQueryTab: (state, action: PayloadAction<TenantQueryTab>) => {
             state.queryTab = action.payload;
         },
@@ -56,8 +44,7 @@ const slice = createSlice({
 });
 
 export default slice.reducer;
-export const {setTenantPage, setQueryTab, setDiagnosticsTab, setSummaryTab, setMetricsTab} =
-    slice.actions;
+export const {setQueryTab, setDiagnosticsTab, setSummaryTab, setMetricsTab} = slice.actions;
 
 export const tenantApi = api.injectEndpoints({
     endpoints: (builder) => ({
diff --git a/src/store/reducers/tenant/types.ts b/src/store/reducers/tenant/types.ts
index 7e140abc88..2204fc95a6 100644
--- a/src/store/reducers/tenant/types.ts
+++ b/src/store/reducers/tenant/types.ts
@@ -19,7 +19,6 @@ export type TenantSummaryTab = ValueOf<typeof TENANT_SUMMARY_TABS_IDS>;
 export type TenantMetricsTab = ValueOf<typeof TENANT_METRICS_TABS_IDS>;
 
 export interface TenantState {
-    tenantPage: TenantPage;
     queryTab?: TenantQueryTab;
     diagnosticsTab: TenantDiagnosticsTab;
     summaryTab?: TenantSummaryTab;
diff --git a/src/store/state-url-mapping.ts b/src/store/state-url-mapping.ts
index df1933729a..db5ae8ba5b 100644
--- a/src/store/state-url-mapping.ts
+++ b/src/store/state-url-mapping.ts
@@ -32,9 +32,6 @@ export const paramSetup = {
             stateKey: 'heatmap.currentMetric',
             initialState: initialHeatmapState.currentMetric,
         },
-        tenantPage: {
-            stateKey: 'tenant.tenantPage',
-        },
         queryTab: {
             stateKey: 'tenant.queryTab',
         },
@@ -82,9 +79,6 @@ export const paramSetup = {
             stateKey: 'heatmap.currentMetric',
             initialState: initialHeatmapState.currentMetric,
         },
-        tenantPage: {
-            stateKey: 'tenant.tenantPage',
-        },
         queryTab: {
             stateKey: 'tenant.queryTab',
         },
diff --git a/src/uiFactory/uiFactory.ts b/src/uiFactory/uiFactory.ts
index 521b7e4f8c..1354677608 100644
--- a/src/uiFactory/uiFactory.ts
+++ b/src/uiFactory/uiFactory.ts
@@ -20,6 +20,8 @@ const uiFactoryBase: UIFactory = {
     },
     hasAccess: true,
     useDatabaseId: false,
+    // useMetaSettings: true,
+    useMetaSettings: false,
 };
 
 export function configureUIFactory<H extends string, T extends string = string>(
diff --git a/src/utils/hooks/useAclSyntax.ts b/src/utils/hooks/useAclSyntax.ts
index 41bca7c597..842f0b4539 100644
--- a/src/utils/hooks/useAclSyntax.ts
+++ b/src/utils/hooks/useAclSyntax.ts
@@ -1,10 +1,8 @@
 import {SETTING_KEYS} from '../../store/reducers/settings/constants';
+import {useSetting} from '../../store/reducers/settings/useSetting';
 import {AclSyntax} from '../constants';
 
-import {useSetting} from './useSetting';
-
 export function useAclSyntax(): string {
-    const [aclSyntax] = useSetting<string | undefined>(SETTING_KEYS.ACL_SYNTAX);
-
+    const {value: aclSyntax} = useSetting<string | undefined>(SETTING_KEYS.ACL_SYNTAX);
     return aclSyntax ?? AclSyntax.YdbShort;
 }
diff --git a/src/utils/hooks/useAutoRefreshInterval.ts b/src/utils/hooks/useAutoRefreshInterval.ts
index aa960fb825..58750a7912 100644
--- a/src/utils/hooks/useAutoRefreshInterval.ts
+++ b/src/utils/hooks/useAutoRefreshInterval.ts
@@ -1,44 +1,44 @@
 import React from 'react';
 
 import {SETTING_KEYS} from '../../store/reducers/settings/constants';
-
-import {useSetting} from './useSetting';
+import {useSetting} from '../../store/reducers/settings/useSetting';
 
 const IMMEDIATE_UPDATE_INTERVAL = 1;
 const DISABLED_INTERVAL = 0;
 
 export function useAutoRefreshInterval(): [number, (value: number) => void] {
-    const [settingValue, setSettingValue] = useSetting(
+    const {value, saveValue: setSettingValue} = useSetting<number>(
         SETTING_KEYS.AUTO_REFRESH_INTERVAL,
-        DISABLED_INTERVAL,
     );
+    const intervalValue = value ?? DISABLED_INTERVAL;
+
     const [effectiveInterval, setEffectiveInterval] = React.useState(
-        document.visibilityState === 'visible' ? settingValue : DISABLED_INTERVAL,
+        document.visibilityState === 'visible' ? intervalValue : DISABLED_INTERVAL,
     );
 
     const lastHiddenTimeRef = React.useRef<number | null>(null);
 
     React.useEffect(() => {
-        setEffectiveInterval(document.visibilityState === 'visible' ? settingValue : 0);
+        setEffectiveInterval(document.visibilityState === 'visible' ? intervalValue : 0);
 
         const handleVisibilityChange = () => {
             const isVisible = document.visibilityState === 'visible';
             if (isVisible) {
-                // If more than settingValue milliseconds have passed since the page was hidden,
+                // If more than intervalValue milliseconds have passed since the page was hidden,
                 // trigger an immediate update
                 const shouldTriggerImmediate =
                     lastHiddenTimeRef.current &&
-                    settingValue !== DISABLED_INTERVAL &&
-                    Date.now() - lastHiddenTimeRef.current >= settingValue;
+                    intervalValue !== DISABLED_INTERVAL &&
+                    Date.now() - lastHiddenTimeRef.current >= intervalValue;
 
                 if (shouldTriggerImmediate) {
                     setEffectiveInterval(IMMEDIATE_UPDATE_INTERVAL);
 
                     setTimeout(() => {
-                        setEffectiveInterval(settingValue);
+                        setEffectiveInterval(intervalValue);
                     }, 0);
                 } else {
-                    setEffectiveInterval(settingValue);
+                    setEffectiveInterval(intervalValue);
                 }
 
                 lastHiddenTimeRef.current = null;
@@ -50,7 +50,7 @@ export function useAutoRefreshInterval(): [number, (value: number) => void] {
 
         document.addEventListener('visibilitychange', handleVisibilityChange);
         return () => document.removeEventListener('visibilitychange', handleVisibilityChange);
-    }, [settingValue]);
+    }, [intervalValue]);
 
     return [effectiveInterval, setSettingValue];
 }
diff --git a/src/utils/hooks/useChangedQuerySettings.ts b/src/utils/hooks/useChangedQuerySettings.ts
index 486c388f0b..0de431b885 100644
--- a/src/utils/hooks/useChangedQuerySettings.ts
+++ b/src/utils/hooks/useChangedQuerySettings.ts
@@ -1,15 +1,15 @@
 import getChangedQueryExecutionSettings from '../../containers/Tenant/Query/QueryEditorControls/utils/getChangedQueryExecutionSettings';
 import getChangedQueryExecutionSettingsDescription from '../../containers/Tenant/Query/QueryEditorControls/utils/getChangedQueryExecutionSettingsDescription';
 import {SETTING_KEYS} from '../../store/reducers/settings/constants';
+import {useSetting} from '../../store/reducers/settings/useSetting';
 import {WEEK_IN_SECONDS} from '../constants';
 import {DEFAULT_QUERY_SETTINGS} from '../query';
 
 import {useLastQueryExecutionSettings} from './useLastQueryExecutionSettings';
 import {useQueryExecutionSettings} from './useQueryExecutionSettings';
-import {useSetting} from './useSetting';
 
 export const useChangedQuerySettings = () => {
-    const [bannerLastClosedTimestamp, setBannerLastClosedTimestamp] = useSetting<
+    const {value: bannerLastClosedTimestamp, saveValue: setBannerLastClosedTimestamp} = useSetting<
         number | undefined
     >(SETTING_KEYS.QUERY_SETTINGS_BANNER_LAST_CLOSED);
     const [lastQuerySettings] = useLastQueryExecutionSettings();
diff --git a/src/utils/hooks/useLastQueryExecutionSettings.ts b/src/utils/hooks/useLastQueryExecutionSettings.ts
index 825eb3130d..3b7a00d576 100644
--- a/src/utils/hooks/useLastQueryExecutionSettings.ts
+++ b/src/utils/hooks/useLastQueryExecutionSettings.ts
@@ -1,13 +1,12 @@
 import {SETTING_KEYS} from '../../store/reducers/settings/constants';
+import {useSetting} from '../../store/reducers/settings/useSetting';
 import type {QuerySettings} from '../../types/store/query';
 import {querySettingsValidationSchema} from '../query';
 
-import {useSetting} from './useSetting';
-
 export const useLastQueryExecutionSettings = () => {
-    const [lastStorageSettings, setLastSettings] = useSetting<QuerySettings | undefined>(
-        SETTING_KEYS.LAST_QUERY_EXECUTION_SETTINGS,
-    );
+    const {value: lastStorageSettings, saveValue: setLastSettings} = useSetting<
+        QuerySettings | undefined
+    >(SETTING_KEYS.LAST_QUERY_EXECUTION_SETTINGS);
     let lastSettings: QuerySettings | undefined;
 
     try {
diff --git a/src/utils/hooks/useQueryExecutionSettings.ts b/src/utils/hooks/useQueryExecutionSettings.ts
index 900d960b41..f61d12997a 100644
--- a/src/utils/hooks/useQueryExecutionSettings.ts
+++ b/src/utils/hooks/useQueryExecutionSettings.ts
@@ -2,6 +2,7 @@ import React from 'react';
 
 import {useTracingLevelOptionAvailable} from '../../store/reducers/capabilities/hooks';
 import {SETTING_KEYS} from '../../store/reducers/settings/constants';
+import {useSetting} from '../../store/reducers/settings/useSetting';
 import type {QuerySettings} from '../../types/store/query';
 import {
     DEFAULT_QUERY_SETTINGS,
@@ -11,17 +12,16 @@ import {
 } from '../query';
 
 import {useQueryStreamingSetting} from './useQueryStreamingSetting';
-import {useSetting} from './useSetting';
 
 export const useQueryExecutionSettings = () => {
     const enableTracingLevel = useTracingLevelOptionAvailable();
-    const [storageSettings, setSettings] = useSetting<QuerySettings>(
+    const {value: storageSettings, saveValue: setSettings} = useSetting<QuerySettings>(
         SETTING_KEYS.QUERY_EXECUTION_SETTINGS,
     );
 
     const validatedSettings = querySettingsRestoreSchema.parse(storageSettings);
-    const [useShowPlanToSvg] = useSetting<boolean>(SETTING_KEYS.USE_SHOW_PLAN_SVG);
-    const [enableQueryStreaming] = useQueryStreamingSetting();
+    const {value: useShowPlanToSvg} = useSetting<boolean>(SETTING_KEYS.USE_SHOW_PLAN_SVG);
+    const {value: enableQueryStreaming} = useQueryStreamingSetting();
 
     const setQueryExecutionSettings = React.useCallback(
         (settings: QuerySettings) => {
diff --git a/src/utils/hooks/useQueryStreamingSetting.ts b/src/utils/hooks/useQueryStreamingSetting.ts
index 2e1ad99a5c..20b48e56a8 100644
--- a/src/utils/hooks/useQueryStreamingSetting.ts
+++ b/src/utils/hooks/useQueryStreamingSetting.ts
@@ -1,10 +1,10 @@
 import {SETTING_KEYS} from '../../store/reducers/settings/constants';
+import {useSetting} from '../../store/reducers/settings/useSetting';
 import {OLD_BACKEND_CLUSTER_NAMES} from '../constants';
 
 import {useClusterNameFromQuery} from './useDatabaseFromQuery';
-import {useSetting} from './useSetting';
 
-export const useQueryStreamingSetting = (): [boolean, (value: boolean) => void] => {
+export const useQueryStreamingSetting = () => {
     const clusterName = useClusterNameFromQuery();
 
     const isOldBackendCluster = clusterName && OLD_BACKEND_CLUSTER_NAMES.includes(clusterName);
diff --git a/src/utils/hooks/useSelectedColumns.ts b/src/utils/hooks/useSelectedColumns.ts
index b799179ff6..69c29000d6 100644
--- a/src/utils/hooks/useSelectedColumns.ts
+++ b/src/utils/hooks/useSelectedColumns.ts
@@ -2,7 +2,7 @@ import React from 'react';
 
 import type {TableColumnSetupItem, TableColumnSetupProps} from '@gravity-ui/uikit';
 
-import {settingsManager} from '../../services/settings';
+import {useSetting} from '../../store/reducers/settings/useSetting';
 
 type OrderedColumn = {id: string; selected?: boolean};
 
@@ -24,25 +24,48 @@ export const useSelectedColumns = <T extends {name: string}>(
     defaultColumnsIds: string[],
     requiredColumnsIds?: string[],
 ) => {
-    const [orderedColumns, setOrderedColumns] = React.useState(() => {
-        const savedColumns = settingsManager.readUserSettingsValue(
-            storageKey,
-            defaultColumnsIds,
-        ) as unknown[];
-
-        const normalizedSavedColumns = savedColumns.map(parseSavedColumn);
-
-        return columns.reduce<OrderedColumn[]>((acc, column) => {
-            const savedColumn = normalizedSavedColumns.find((c) => c && c.id === column.name);
-            if (savedColumn) {
-                acc.push(savedColumn);
-            } else {
-                acc.push({id: column.name, selected: false});
+    const {value: savedColumns, saveValue: saveColumns} = useSetting<string[] | OrderedColumn[]>(
+        storageKey,
+    );
+
+    const normalizeSavedColumns = React.useCallback(
+        (columnsToUse: string[] | OrderedColumn[]) => {
+            const parsedSavedColumns = columnsToUse
+                .map(parseSavedColumn)
+                .filter((column): column is OrderedColumn => Boolean(column));
+
+            const needToNormalize =
+                (columnsToUse.length && typeof columnsToUse[0] === 'string') ||
+                parsedSavedColumns.length !== columns.length;
+
+            if (needToNormalize) {
+                return columns.reduce<OrderedColumn[]>((acc, column) => {
+                    const savedColumn = parsedSavedColumns.find((c) => c && c.id === column.name);
+                    if (savedColumn) {
+                        acc.push(savedColumn);
+                    } else {
+                        acc.push({id: column.name, selected: false});
+                    }
+                    return acc;
+                }, []);
             }
-            return acc;
-        }, []);
+
+            return parsedSavedColumns;
+        },
+        [columns],
+    );
+
+    const [orderedColumns, setOrderedColumns] = React.useState(() => {
+        return normalizeSavedColumns(defaultColumnsIds);
     });
 
+    React.useEffect(() => {
+        const rawColumns = savedColumns !== undefined ? savedColumns : defaultColumnsIds;
+        const normalizedColumns = normalizeSavedColumns(rawColumns);
+
+        setOrderedColumns(normalizedColumns);
+    }, [savedColumns, defaultColumnsIds]);
+
     const columnsToSelect = React.useMemo(() => {
         const preparedColumns = orderedColumns.reduce<(TableColumnSetupItem & {column: T})[]>(
             (acc, {id, selected}) => {
@@ -76,10 +99,10 @@ export const useSelectedColumns = <T extends {name: string}>(
         (value) => {
             const preparedColumns = value.map(({id, selected}) => ({id, selected}));
 
-            settingsManager.setUserSettingsValue(storageKey, preparedColumns);
+            saveColumns(preparedColumns);
             setOrderedColumns(preparedColumns);
         },
-        [storageKey],
+        [saveColumns],
     );
 
     return {
diff --git a/src/utils/i18n/i18n.ts b/src/utils/i18n/i18n.ts
index 8027c49617..a6a36911e5 100644
--- a/src/utils/i18n/i18n.ts
+++ b/src/utils/i18n/i18n.ts
@@ -7,8 +7,6 @@ enum Lang {
     Ru = 'ru',
 }
 
-const defaultLang = Lang.En;
-
 // Disable russian language while it is not properly supported
 // Force English locale for users who previously selected Russian when the setting was available
 // const currentLang = settingsManager.readUserSettingsValue(LANGUAGE_KEY, defaultLang) as Lang;
@@ -33,4 +31,4 @@ export function registerKeysets<Keyset extends KeysData>(id: string, data: Recor
     return i18n.keyset<Keys>(id);
 }
 
-export {i18n, Lang, currentLang, defaultLang};
+export {i18n, Lang, currentLang};