diff --git a/webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts b/webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts
index 6d3c32b397..078d90775f 100644
--- a/webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts
+++ b/webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts
@@ -68,6 +68,7 @@ export class ContainerDataSource extends DatabaseDataSource<IDataContainerOption
     }
 
     const executionContext = await this.ensureContextCreated();
+    const offset = this.offset;
     const limit = this.count;
 
     const fetchTableProcess = new FetchTableDataAsyncProcess(this.graphQLService, this.notificationService);
@@ -79,7 +80,7 @@ export class ContainerDataSource extends DatabaseDataSource<IDataContainerOption
         containerNodePath: this.options.containerNodePath,
       },
       {
-        offset: this.offset,
+        offset,
         limit,
         constraints: this.options.constraints,
         where: this.options.whereFilter || undefined,
@@ -102,8 +103,6 @@ export class ContainerDataSource extends DatabaseDataSource<IDataContainerOption
       id: result.resultSet?.id || '0',
       dataFormat: result.dataFormat!,
       loadedFully: (result.resultSet?.rows?.length || 0) < limit,
-      // allays returns false
-      // || !result.resultSet?.hasMoreData,
       data: result.resultSet,
     }));
   }
diff --git a/webapp/packages/plugin-data-viewer/src/DataViewerTableService.ts b/webapp/packages/plugin-data-viewer/src/DataViewerTableService.ts
index df808ea7c8..8e6210237d 100644
--- a/webapp/packages/plugin-data-viewer/src/DataViewerTableService.ts
+++ b/webapp/packages/plugin-data-viewer/src/DataViewerTableService.ts
@@ -57,6 +57,8 @@ export class DataViewerTableService {
         })
         .setSupportedDataFormats(connectionInfo.supportedDataFormats)
     )
+      .setCountGain()
+      .setSlice(0)
       .setAccess(connectionInfo.readOnly ? DatabaseDataAccessMode.Readonly : DatabaseDataAccessMode.Default);
 
     return dataModel;
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataModel.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataModel.ts
index b5676d34a0..1724168038 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataModel.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataModel.ts
@@ -85,7 +85,7 @@ implements IDatabaseDataModel<TOptions, TResult> {
     return this;
   }
 
-  setSlice(offset: number, count: number): this {
+  setSlice(offset: number, count = this.countGain): this {
     this.source.setSlice(offset, count);
     return this;
   }
diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataModel.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataModel.ts
index 21c0840527..63b8d4a693 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataModel.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/IDatabaseDataModel.ts
@@ -32,7 +32,7 @@ export interface IDatabaseDataModel<TOptions, TResult extends IDatabaseDataResul
 
   setCountGain: (count: number) => this;
   setAccess: (access: DatabaseDataAccessMode) => this;
-  setSlice: (offset: number, count: number) => this;
+  setSlice: (offset: number, count?: number) => this;
   setOptions: (options: TOptions) => this;
   setDataFormat: (dataFormat: ResultDataFormat) => this;
   setSupportedDataFormats: (dataFormats: ResultDataFormat[]) => this;
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/DataModelWrapper.ts b/webapp/packages/plugin-data-viewer/src/TableViewer/DataModelWrapper.ts
index 9c4d2cd1cc..2a4a973100 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/DataModelWrapper.ts
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/DataModelWrapper.ts
@@ -90,7 +90,7 @@ export class DataModelWrapper extends DatabaseDataModel<IDataContainerOptions, I
     await this.requestData();
   }
 
-  setCountGain(count: number): this {
+  setCountGain(count?: number): this {
     const realCount = this.getDefaultRowsCount(count);
     this.countGain = realCount;
 
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewerModel.ts b/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewerModel.ts
index be3e6d1360..400669b5b2 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewerModel.ts
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewerModel.ts
@@ -171,9 +171,8 @@ export class TableViewerModel {
   }
 
   insertRows(position: number, rows: TableRow[], hasMore: boolean): void {
-    const isRowsAddition = this.tableDataModel.getRows().length < position + rows.length;
     this.tableDataModel.insertRows(position, rows);
-    this._hasMoreRows = isRowsAddition ? hasMore : this._hasMoreRows;
+    this._hasMoreRows = hasMore;
   }
 
   setColumns(columns: TableColumn[]): void {
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTabsService.ts b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTabsService.ts
index 2d97f48b0c..f270511eea 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTabsService.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTabsService.ts
@@ -76,7 +76,9 @@ export class SqlResultTabsService {
 
     if (inNewTab || !currentTab?.groupId) {
       source = new QueryDataSource(this.graphQLService, this.notificationService, this);
-      model = this.tableViewerStorageService.create(source);
+      model = this.tableViewerStorageService.create(source)
+        .setCountGain()
+        .setSlice(0);
 
       tabGroup = this.createGroup(sqlQueryParams, editorState, model.id);