diff --git a/.changeset/forty-lands-leave.md b/.changeset/forty-lands-leave.md
new file mode 100644
index 0000000..a28f44f
--- /dev/null
+++ b/.changeset/forty-lands-leave.md
@@ -0,0 +1,5 @@
+---
+"sqlseal": patch
+---
+
+fixing issue with grid not displaying properly
diff --git a/src/renderer/GridRenderer.ts b/src/renderer/GridRenderer.ts
index c21953e..77e8aca 100644
--- a/src/renderer/GridRenderer.ts
+++ b/src/renderer/GridRenderer.ts
@@ -8,6 +8,11 @@ import SqlSealPlugin from "../main";
 import { ModernCellParser } from "../cellParser/ModernCellParser";
 import { EventRef } from "obsidian";
 
+interface DataParam {
+    data: Record<string, unknown>[],
+    columns?: string[]
+}
+
 const getCurrentTheme = () => {
     return document.body.classList.contains('theme-dark') ? 'dark' : 'light';
 }
@@ -55,14 +60,16 @@ export class GridRendererCommunicator {
             if (this._gridApi) {
                 clearTimeout(resizeTimeout);
                 resizeTimeout = setTimeout(() => {
-                    this._gridApi.autoSizeAllColumns();
+                    if (!this._gridApi.isDestroyed()) {
+                        this._gridApi.autoSizeAllColumns();
+                    }
                 }, 100);
             }
         });
         this.resizeObserver.observe(this.el);
 
         this.unregisterLeafChange = this.app.workspace.on('active-leaf-change', (leaf) => {
-            if (this._gridApi && leaf?.view?.getViewType() !== 'canvas') {
+            if (this._gridApi && leaf?.view?.getViewType() !== 'canvas' && !this._gridApi.isDestroyed()) {
                 this._gridApi.autoSizeAllColumns();
             }
         });
@@ -137,6 +144,9 @@ export class GridRendererCommunicator {
         if (!this.gridApi) {
             throw new Error('Grid has not been initiated')
         }
+        if (columns && columns.length) {
+            this.gridApi.setGridOption('columnDefs', columns.map(field => ({ field })))
+        }
         this.gridApi.setGridOption('rowData', data)
         this.gridApi.setGridOption('loading', false)
     }
@@ -180,8 +190,8 @@ export class GridRenderer implements RendererConfig {
     render(config: Partial<GridOptions>, el: HTMLElement, { cellParser }: RendererContext) {
         const communicator = new GridRendererCommunicator(el, config, this.plugin, this.app, cellParser)
         return {
-            render: (data: any) => {
-                communicator.setData(data.columns, data.data)
+            render: (data: DataParam) => {
+                communicator.setData(data.columns ?? [], data.data)
                 communicator.gridApi.autoSizeAllColumns()
             },
             error: (message: string) => {