diff --git a/webapp/packages/core-app/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeControl.tsx b/webapp/packages/core-app/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeControl.tsx
index e1865476a4..06cb916fa6 100644
--- a/webapp/packages/core-app/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeControl.tsx
+++ b/webapp/packages/core-app/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeControl.tsx
@@ -65,7 +65,7 @@ export const NavigationNodeControl: NavTreeControlComponent = observer(function
     || !!navTreeResource.getException(node.id)
   ));
   const connected = getComputed(() => node.objectFeatures.includes(EObjectFeature.dataSourceConnected));
-  const selected = getComputed(() => treeNodeContext.selected);
+  const selected = treeNodeContext.selected;
 
   const [editing, setEditing] = useState(false);
 
diff --git a/webapp/packages/core-blocks/src/Table/TableItem.tsx b/webapp/packages/core-blocks/src/Table/TableItem.tsx
index 217462637e..2de5abf974 100644
--- a/webapp/packages/core-blocks/src/Table/TableItem.tsx
+++ b/webapp/packages/core-blocks/src/Table/TableItem.tsx
@@ -54,7 +54,7 @@ export const TableItem = observer<Props>(function TableItem({
     throw new Error('TableContext must be provided');
   }
 
-  const selectionDisabled = getComputed(() => selectDisabled || (!!context.state.isItemSelectable && ((
+  const selectionDisabled = selectDisabled || getComputed(() => (!!context.state.isItemSelectable && ((
     context.state.selectableItems.length > 0 && !context.state.selectableItems.includes(item)
   ) || !context.state.isItemSelectable(item))));
 
diff --git a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeExpand.tsx b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeExpand.tsx
index 2f106501e5..e7383236fd 100644
--- a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeExpand.tsx
+++ b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeExpand.tsx
@@ -44,8 +44,8 @@ export const TreeNodeExpand = observer<Props>(function TreeNodeExpand({
     throw new Error('Context not provided');
   }
 
-  disabled = getComputed(() => context.externalExpanded || context.disabled || disabled);
-  leaf = getComputed(() => context.leaf || leaf);
+  disabled = getComputed(() => context.externalExpanded || context.disabled) || disabled;
+  leaf = context.leaf || leaf;
   const loading = useStateDelay(getComputed(() => context.loading || context.processing), 300);
   const expandable = getComputed(() => !loading && (!leaf || context.externalExpanded));
 
diff --git a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeSelect.tsx b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeSelect.tsx
index e6cbb6be53..f4c3b77b5f 100644
--- a/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeSelect.tsx
+++ b/webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeSelect.tsx
@@ -48,10 +48,10 @@ export const TreeNodeSelect = observer<Props>(function TreeNodeSelect({
     throw new Error('Context not provided');
   }
 
-  disabled = getComputed(() => context.disabled || disabled);
-  group = getComputed(() => group ?? context.group);
-  const loading = getComputed(() => loadIndicator && context.loading);
-  selected = getComputed(() => selected ?? context.selected);
+  disabled = disabled || context.disabled;
+  group = group ?? context.group;
+  const loading = loadIndicator && context.loading;
+  selected = selected ?? context.selected;
 
   async function handleSelect() {
     await onSelect?.();
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UsersTable.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UsersTable.tsx
index 0acf1c6645..33e33235eb 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UsersTable.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UsersTable.tsx
@@ -72,7 +72,7 @@ export const UsersTable = observer<Props>(function UsersTable({ sub, param }) {
   const controller = useController(UsersTableController);
   const usersResource = useMapResource(UsersTable, UsersResource, CachedMapAllKey);
   const isLocalProviderAvailable = controller.isLocalProviderAvailable;
-  const users = getComputed(() => usersResource.data
+  const users = usersResource.data
     .filter<AdminUser>(filterUndefined)
     .sort((a, b) => {
       if (usersResource.resource.isNew(a.userId) === usersResource.resource.isNew(b.userId)) {
@@ -82,7 +82,7 @@ export const UsersTable = observer<Props>(function UsersTable({ sub, param }) {
         return -1;
       }
       return 1;
-    }));
+    });
 
   const create = param === 'create';
   const keys = users.map(user => user.userId);
diff --git a/webapp/packages/plugin-authentication/src/Dialog/AuthProviderForm/ConfigurationsList.tsx b/webapp/packages/plugin-authentication/src/Dialog/AuthProviderForm/ConfigurationsList.tsx
index 86adf4e2d6..282d0ab846 100644
--- a/webapp/packages/plugin-authentication/src/Dialog/AuthProviderForm/ConfigurationsList.tsx
+++ b/webapp/packages/plugin-authentication/src/Dialog/AuthProviderForm/ConfigurationsList.tsx
@@ -68,19 +68,19 @@ export const ConfigurationsList = observer<Props>(function ConfigurationsList({
     )).flat()
   );
 
-  const filteredConfigurations = getComputed(() => {
-    const sortedConfigurations = configurations
-      .slice()
-      .sort((a, b) => comparePublicAuthConfigurations(a.configuration, b.configuration)) || [];
+  const sortedConfigurations = configurations
+    .slice()
+    .sort((a, b) => comparePublicAuthConfigurations(a.configuration, b.configuration));
 
-    if (!search) {
-      return sortedConfigurations;
-    }
+  let filteredConfigurations: IProviderConfiguration[];
 
-    return sortedConfigurations.filter(({ configuration }) => {
-      const target = `${configuration.displayName}${configuration.description || ''}`;
-      return target.toUpperCase().includes(search.toUpperCase());
-    });
+  if (!search) {
+    filteredConfigurations =  sortedConfigurations;
+  }
+
+  filteredConfigurations =  sortedConfigurations.filter(({ configuration }) => {
+    const target = `${configuration.displayName}${configuration.description || ''}`;
+    return target.toUpperCase().includes(search.toUpperCase());
   });
 
   async function auth({ provider, configuration }: IProviderConfiguration) {
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTabs.tsx b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTabs.tsx
index 1d8cfa7b76..c41a3317a8 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTabs.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTabs.tsx
@@ -56,7 +56,7 @@ export const SqlResultTabs = observer<Props>(function SqlDataResult({ state, onT
   const translate = useTranslate();
   const sqlResultTabsService = useService(SqlResultTabsService);
 
-  const orderedTabs = getComputed(() => state.tabs
+  const orderedTabs = state.tabs
     .slice()
     .sort((tabA, tabB) => {
       const resultTabA = state.resultTabs.find(tab => tab.tabId === tabA.id);
@@ -67,7 +67,7 @@ export const SqlResultTabs = observer<Props>(function SqlDataResult({ state, onT
       }
 
       return tabA.order - tabB.order;
-    }));
+    });
 
   function handleSelect(tab: ITabData) {
     sqlResultTabsService.selectResultTab(state, tab.tabId);