diff --git a/app/panels/samples/data_grid.js b/app/panels/samples/data_grid.js
index 423e9b6..8041cb7 100644
--- a/app/panels/samples/data_grid.js
+++ b/app/panels/samples/data_grid.js
@@ -117,10 +117,11 @@ const DataGrid = ({ title }) => {
                 ...pv,
                 columnsDef: data.XCOLUMNS_DEF ? [...data.XCOLUMNS_DEF] : pv.columnsDef,
                 rows: pv.pageNumber == 1 ? [...(data.XROWS || [])] : [...pv.rows, ...(data.XROWS || [])],
-                groups:
-                    pv.pageNumber == 1
-                        ? [...(data.XGROUPS || [])]
-                        : [...pv.groups, ...(data.XGROUPS.filter(g => !pv.groups.find(pg => pg.name == g.name)) || [])],
+                groups: data.XGROUPS
+                    ? pv.pageNumber == 1
+                        ? [...data.XGROUPS]
+                        : [...pv.groups, ...data.XGROUPS.filter(g => !pv.groups.find(pg => pg.name == g.name))]
+                    : [...pv.groups],
                 dataLoaded: true,
                 reload: false,
                 morePages: (data.XROWS || []).length >= DATA_GRID_PAGE_SIZE
diff --git a/app/panels/samples/gantt.js b/app/panels/samples/gantt.js
index 4883581..6ce43b9 100644
--- a/app/panels/samples/gantt.js
+++ b/app/panels/samples/gantt.js
@@ -20,7 +20,7 @@ import { BackEndСtx } from "../../context/backend"; //Контекст взаи
 //---------
 
 //Высота диаграммы Ганта
-const GANTT_HEIGHT = "600px";
+const GANTT_HEIGHT = "70vh";
 
 //Ширина диаграммы Ганта
 const GANTT_WIDTH = "98vw";