diff --git a/webapp/packages/core-connections/src/Administration/Connections/ConnectionsAdministrationService.ts b/webapp/packages/core-connections/src/Administration/Connections/ConnectionsAdministrationService.ts
index b4ba01bfd9..1f379929a1 100644
--- a/webapp/packages/core-connections/src/Administration/Connections/ConnectionsAdministrationService.ts
+++ b/webapp/packages/core-connections/src/Administration/Connections/ConnectionsAdministrationService.ts
@@ -6,12 +6,10 @@
  * you may not use this file except in compliance with the License.
  */
 
-import { AdministrationItemService, AdministrationItemType, AdministrationScreenService } from '@cloudbeaver/core-administration';
+import { AdministrationItemService, AdministrationItemType } from '@cloudbeaver/core-administration';
 import { injectable, Bootstrap } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
-import { GraphQLService } from '@cloudbeaver/core-sdk';
 
-import { ConnectionInfoResource } from '../../ConnectionInfoResource';
 import { DBDriverResource } from '../../DBDriverResource';
 import { ConnectionsResource } from '../ConnectionsResource';
 import { ConnectionsAdministration } from './ConnectionsAdministration';
@@ -20,19 +18,15 @@ import { ConnectionsDrawerItem } from './ConnectionsDrawerItem';
 @injectable()
 export class ConnectionsAdministrationService extends Bootstrap {
   constructor(
-    private administrationScreenService: AdministrationScreenService,
     private administrationItemService: AdministrationItemService,
     private notificationService: NotificationService,
     private connectionsResource: ConnectionsResource,
-    private connectionInfoResource: ConnectionInfoResource,
     private dbDriverResource: DBDriverResource,
-    private graphQLService: GraphQLService
   ) {
     super();
   }
 
   register() {
-    this.administrationScreenService.activationEvent.addHandler((_, state) => this.handleDeactivate(state));
 
     this.administrationItemService.create({
       name: 'connections',
@@ -53,14 +47,6 @@ export class ConnectionsAdministrationService extends Bootstrap {
 
   load(): void | Promise<void> { }
 
-  private async handleDeactivate(state: boolean) {
-    // if (state) {
-    // return;
-    // }
-
-    // this.connectionInfoResource.markOutdated();
-  }
-
   private async loadConnections() {
     try {
       await this.connectionsResource.loadAll();
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooter.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooter.tsx
index f803a941bb..e300f22a84 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooter.tsx
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooter.tsx
@@ -75,7 +75,16 @@ export const TableFooter = observer(function TableFooter({
 }: TableFooterProps) {
   const ref = useRef<HTMLInputElement>(null);
   const handleChange = useCallback(
-    () => ref.current && model.setChunkSize(parseInt(ref.current.value, 10)),
+    () => {
+      if (!ref.current) {
+        return;
+      }
+      const value = parseInt(ref.current.value, 10);
+
+      if (model.getChunkSize() !== value) {
+        model.setChunkSize(value);
+      }
+    },
     [model]
   );