diff --git a/webapp/packages/core-blocks/src/CommonDialog/RenameDialog.tsx b/webapp/packages/core-blocks/src/CommonDialog/RenameDialog.tsx
index 2dd2b39eac..9ab7d3a555 100644
--- a/webapp/packages/core-blocks/src/CommonDialog/RenameDialog.tsx
+++ b/webapp/packages/core-blocks/src/CommonDialog/RenameDialog.tsx
@@ -33,7 +33,7 @@ interface IRenameDialogState {
   message: string | undefined;
   valid: boolean;
   payload: RenameDialogPayload;
-  validate: () => void;
+  validate: () => Promise<void>;
   setMessage: (message: string) => void;
 }
 
@@ -97,7 +97,7 @@ export const RenameDialog: DialogComponent<RenameDialogPayload, string> = observ
   );
 
   useEffect(() => {
-    state.validate();
+    state.validate().catch(() => {});
   }, [name]);
 
   const errorMessage = state.valid ? ' ' : translate(state.message ?? 'ui_rename_taken_or_invalid');
@@ -108,7 +108,7 @@ export const RenameDialog: DialogComponent<RenameDialogPayload, string> = observ
       <CommonDialogBody>
         <Form ref={focusedRef} onSubmit={() => resolveDialog(state.name)}>
           <Container center>
-            <InputField name="name" state={state} error={!state.valid} description={errorMessage} onChange={() => state.validate()}>
+            <InputField name="name" state={state} error={!state.valid} description={errorMessage} onChange={() => state.validate().catch(() => {})}>
               {translate('ui_name') + ':'}
             </InputField>
           </Container>
diff --git a/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContextResource.ts b/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContextResource.ts
index ad12575d22..cfdecf5753 100644
--- a/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContextResource.ts
+++ b/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContextResource.ts
@@ -119,24 +119,23 @@ export class ConnectionExecutionContextResource extends CachedMapResource<string
   }
 
   async destroy(contextId: string): Promise<void> {
-    const context = this.get(contextId);
+    await this.performUpdate(contextId, [], async () => {
+      const context = this.get(contextId);
 
-    if (!context) {
-      return;
-    }
+      if (!context) {
+        return;
+      }
 
-    await this.performUpdate(contextId, [], async () => {
       await this.graphQLService.sdk.executionContextDestroy({
         contextId: context.id,
         connectionId: context.connectionId,
         projectId: context.projectId,
       });
-      this.onDataOutdated.execute(contextId);
+      this.delete(contextId);
     });
 
     runInAction(() => {
       this.markOutdated(); // TODO: should be removed, currently multiple contexts for same connection may change catalog/schema for all contexts of connection
-      this.delete(contextId);
     });
   }
 
diff --git a/webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts b/webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts
index 1e6faa5d96..d2af27e1a2 100644
--- a/webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts
+++ b/webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts
@@ -138,8 +138,6 @@ export class ContainerDataSource extends ResultSetDataSource<IDataContainerOptio
 
       this.clearError();
 
-      await this.closeResults(prevResults);
-
       return this.transformResults(executionContext.context!, response.results, limit);
     } catch (exception: any) {
       this.error = exception;
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataModel.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataModel.ts
index 32192e3554..392db17c56 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataModel.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataModel.ts
@@ -162,9 +162,9 @@ export class DatabaseDataModel<TOptions, TResult extends IDatabaseDataResult = I
     this.source.resetData();
   }
 
-  async dispose(): Promise<void> {
+  async dispose(keepExecutionContext = false): Promise<void> {
     await this.onDispose.execute();
-    await this.source.dispose();
+    await this.source.dispose(keepExecutionContext);
   }
 
   async requestSaveAction(action: () => Promise<void> | void): Promise<void> {
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataSource.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataSource.ts
index f5278b30c8..2f79fd236b 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataSource.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataSource.ts
@@ -372,9 +372,11 @@ export abstract class DatabaseDataSource<TOptions, TResult extends IDatabaseData
     return this;
   }
 
-  async dispose(): Promise<void> {
+  async dispose(keepExecutionContext = false): Promise<void> {
     await this.cancel();
-    await this.executionContext?.destroy();
+    if (!keepExecutionContext) {
+      await this.executionContext?.destroy();
+    }
   }
 
   abstract request(prevResults: TResult[]): TResult[] | Promise<TResult[]>;
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataModel.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataModel.ts
index 209005db21..dc7d1c5f51 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataModel.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataModel.ts
@@ -57,5 +57,5 @@ export interface IDatabaseDataModel<TOptions = any, TResult extends IDatabaseDat
   requestDataPortion: (offset: number, count: number) => Promise<void>;
   cancel: () => Promise<void> | void;
   resetData: () => void;
-  dispose: () => Promise<void>;
+  dispose: (keepExecutionContext?: boolean) => Promise<void>;
 }
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataSource.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataSource.ts
index 7a7f9baa4f..1b5b3f8a97 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataSource.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataSource.ts
@@ -97,5 +97,5 @@ export interface IDatabaseDataSource<TOptions, TResult extends IDatabaseDataResu
   cancel: () => Promise<void> | void;
   clearError: () => this;
   resetData: () => this;
-  dispose: () => Promise<void>;
+  dispose: (keepExecutionContext?: boolean) => Promise<void>;
 }
diff --git a/webapp/packages/plugin-data-viewer/src/ResultSetDataSource.ts b/webapp/packages/plugin-data-viewer/src/ResultSetDataSource.ts
index 04aa079a52..00d21abd5b 100644
--- a/webapp/packages/plugin-data-viewer/src/ResultSetDataSource.ts
+++ b/webapp/packages/plugin-data-viewer/src/ResultSetDataSource.ts
@@ -77,13 +77,26 @@ export abstract class ResultSetDataSource<TOptions> extends DatabaseDataSource<T
     return this.totalCountRequestTask;
   }
 
-  async closeResults(results: IDatabaseResultSet[]): Promise<void> {
+  setResults(results: IDatabaseResultSet[]): this {
+    this.closeResults(this.results);
+    return super.setResults(results);
+  }
+
+  async dispose(keepExecutionContext?: boolean): Promise<void> {
+    if (keepExecutionContext) {
+      await this.closeResults(this.results);
+    }
+    return super.dispose(keepExecutionContext);
+  }
+
+  private async closeResults(results: IDatabaseResultSet[]): Promise<void> {
     if (!this.executionContext?.context) {
       return;
     }
 
     for (const result of results) {
-      if (result.id === null) {
+      // TODO: it's better to track that context is closed with subscription
+      if (result.id === null || result.contextId !== this.executionContext.context.id) {
         continue;
       }
       try {
diff --git a/webapp/packages/plugin-projects/src/FolderDialog.tsx b/webapp/packages/plugin-projects/src/FolderDialog.tsx
index e9587ab7d2..d47c500488 100644
--- a/webapp/packages/plugin-projects/src/FolderDialog.tsx
+++ b/webapp/packages/plugin-projects/src/FolderDialog.tsx
@@ -112,7 +112,10 @@ export const FolderDialog: DialogComponent<FolderDialogPayload, IFolderDialogRes
               state.setMessage(message);
             }
           });
-        } catch {}
+        } catch (exception: any) {
+          valid = false;
+          state.setMessage(exception.message);
+        }
 
         if (state.folder === folder && state.value === value && state.projectId === projectId) {
           state.valid = valid ?? true;
@@ -143,14 +146,16 @@ export const FolderDialog: DialogComponent<FolderDialogPayload, IFolderDialogRes
   const projectInfoLoader = useResource(FolderDialog, ProjectInfoResource, state.projectId);
 
   async function resolveHandler() {
-    await state.validate();
-    if (state.valid) {
-      resolveDialog({ folder: state.folder, name: state.value, projectId: state.projectId });
-    }
+    try {
+      await state.validate();
+      if (state.valid) {
+        resolveDialog({ folder: state.folder, name: state.value, projectId: state.projectId });
+      }
+    } catch {}
   }
 
   useEffect(() => {
-    state.validate();
+    state.validate().catch(() => {});
   }, [state.value, state.projectId]);
 
   const errorMessage = state.valid ? ' ' : translate(state.message ?? 'ui_rename_taken_or_invalid');
@@ -169,7 +174,7 @@ export const FolderDialog: DialogComponent<FolderDialogPayload, IFolderDialogRes
               error={!state.valid}
               description={errorMessage}
               loading={state.validationInProgress}
-              onChange={() => state.validate()}
+              onChange={() => state.validate().catch(() => {})}
             >
               {translate('ui_name') + ':'}
             </InputField>
diff --git a/webapp/packages/plugin-sql-editor/src/QueryDataSource.ts b/webapp/packages/plugin-sql-editor/src/QueryDataSource.ts
index 5cb9acace8..1f5c2810c2 100644
--- a/webapp/packages/plugin-sql-editor/src/QueryDataSource.ts
+++ b/webapp/packages/plugin-sql-editor/src/QueryDataSource.ts
@@ -246,8 +246,6 @@ export class QueryDataSource<TOptions extends IDataQueryOptions = IDataQueryOpti
         return prevResults;
       }
 
-      this.closeResults(prevResults);
-
       return results;
     } catch (exception: any) {
       this.error = exception;
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlQueryResultService.ts b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlQueryResultService.ts
index a83db3c0f1..db3ba4146c 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlQueryResultService.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlQueryResultService.ts
@@ -160,15 +160,9 @@ export class SqlQueryResultService {
 
       if (isGroupEmpty) {
         state.resultGroups.splice(state.resultGroups.indexOf(group), 1);
-
-        // TODO: we need to dispose table model, but don't close execution context, so now we only
         const model = this.tableViewerStorageService.get(group.modelId);
-        // model?.dispose();
 
-        if (model?.source instanceof ResultSetDataSource) {
-          model.source.closeResults(model.getResults());
-          model.cancel();
-        }
+        model?.dispose(true);
 
         this.tableViewerStorageService.remove(group.modelId);
       }
diff --git a/webapp/packages/plugin-sql-editor/src/useDataSource.ts b/webapp/packages/plugin-sql-editor/src/useDataSource.ts
index eb9c1014cc..84018fc56f 100644
--- a/webapp/packages/plugin-sql-editor/src/useDataSource.ts
+++ b/webapp/packages/plugin-sql-editor/src/useDataSource.ts
@@ -7,7 +7,6 @@
  */
 import { useEffect } from 'react';
 
-import { useObjectRef, useObservableRef } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 
 import type { ISqlDataSource } from './SqlDataSource/ISqlDataSource';