diff --git a/packages/web/src/datagrid/LoadingDataGridCore.svelte b/packages/web/src/datagrid/LoadingDataGridCore.svelte
index f0a67c5d4..8c3b1de61 100644
--- a/packages/web/src/datagrid/LoadingDataGridCore.svelte
+++ b/packages/web/src/datagrid/LoadingDataGridCore.svelte
@@ -121,14 +121,15 @@
 </script>
 
 <DataGridCore
-  bind:this={domGrid}
   {...$$props}
+  bind:this={domGrid}
+  bind:selectedCellsPublished
   onLoadNextData={handleLoadNextData}
   {errorMessage}
-  {grider}
   {isLoading}
   allRowCount={rowCountLoaded || allRowCount}
   {isLoadedAll}
   {loadedTime}
-  bind:selectedCellsPublished
+  {grider}
+  {display}
 />
diff --git a/packages/web/src/datagrid/SqlDataGridCore.svelte b/packages/web/src/datagrid/SqlDataGridCore.svelte
index fbe6ee32c..52762a94b 100644
--- a/packages/web/src/datagrid/SqlDataGridCore.svelte
+++ b/packages/web/src/datagrid/SqlDataGridCore.svelte
@@ -100,16 +100,29 @@
 
   let loadedRows = [];
 
+  let grider;
+
   // $: console.log('loadedRows BIND', loadedRows);
-  $: grider = new ChangeSetGrider(
-    loadedRows,
-    changeSetState,
-    dispatchChangeSet,
-    display,
-    macroPreview,
-    macroValues,
-    selectedCellsPublished()
-  );
+
+  $: {
+    if (macroPreview) {
+      grider = new ChangeSetGrider(
+        loadedRows,
+        changeSetState,
+        dispatchChangeSet,
+        display,
+        macroPreview,
+        macroValues,
+        selectedCellsPublished()
+      );
+    }
+  }
+  // prevent recreate grider, if no macro is selected, so there is no need to selectedcells in macro
+  $: {
+    if (!macroPreview) {
+      grider = new ChangeSetGrider(loadedRows, changeSetState, dispatchChangeSet, display);
+    }
+  }
   // $: console.log('GRIDER', grider);
   // $: if (onChangeGrider) onChangeGrider(grider);
 
@@ -200,4 +213,5 @@
   bind:selectedCellsPublished
   frameSelection={!!macroPreview}
   {grider}
+  {display}
 />
diff --git a/packages/web/src/datagrid/TableDataGrid.svelte b/packages/web/src/datagrid/TableDataGrid.svelte
index e2e9331c9..b38120bbc 100644
--- a/packages/web/src/datagrid/TableDataGrid.svelte
+++ b/packages/web/src/datagrid/TableDataGrid.svelte
@@ -58,8 +58,6 @@
 
   const childCache = writable(createGridCache());
 
-  // $: console.log('display', display);
-
   $: display =
     connection && $serverVersion
       ? new TableGridDisplay(
diff --git a/packages/web/src/datagrid/gridutil.ts b/packages/web/src/datagrid/gridutil.ts
index b0d15275f..3b9e26ef3 100644
--- a/packages/web/src/datagrid/gridutil.ts
+++ b/packages/web/src/datagrid/gridutil.ts
@@ -6,6 +6,8 @@ import Grider from './Grider';
 import { isJsonLikeLongString, safeJsonParse } from 'dbgate-tools';
 
 export function countColumnSizes(grider: Grider, columns, containerWidth, display: GridDisplay) {
+  // console.log('COUNT SIZES');
+
   const columnSizes = new SeriesSizes();
   if (!grider || !columns || !display) return columnSizes;