diff --git a/packages/tabulator-table/rollup.config.js b/packages/tabulator-table/rollup.config.js
index 20c8be4fac892506018de2e3c0c37bed5778bf8a..fc1ab914ac6ded9753f470659aa2484904523191 100644
--- a/packages/tabulator-table/rollup.config.js
+++ b/packages/tabulator-table/rollup.config.js
@@ -17,7 +17,10 @@ export default (async () => {
     return {
         input:
             build !== 'test'
-                ? ['src/demo.js', 'src/dbp-tabulator-table.js']
+                ? [
+                    'src/demo.js',
+                    'src/dbp-tabulator-table.js'
+                ]
                 : glob.sync('test/**/*.js'),
         output: {
             dir: 'dist',
diff --git a/packages/tabulator-table/src/tabulator-table.js b/packages/tabulator-table/src/tabulator-table.js
index d3c4dbdaa1f7620510c82ec1fedc31eaa5ff952e..2af016bda7aa679361a001f043ecd3119e49f755 100644
--- a/packages/tabulator-table/src/tabulator-table.js
+++ b/packages/tabulator-table/src/tabulator-table.js
@@ -66,8 +66,10 @@ export class TabulatorTable extends ScopedElementsMixin(DBPLitElement) {
     }
 
     disconnectedCallback() {
-        this.tabulatorTable.off("tableBuilt");
-        this.tabulatorTable.off("rowClick");
+        if (this.tabulatorTable) {
+            this.tabulatorTable.off("tableBuilt");
+            this.tabulatorTable.off("rowClick");
+        }
 
         super.disconnectedCallback();
     }