diff --git a/packages/core-components/src/components/table/table-row/table-row.tsx b/packages/core-components/src/components/table/table-row/table-row.tsx
index 2c0c3e7c..9a537e08 100644
--- a/packages/core-components/src/components/table/table-row/table-row.tsx
+++ b/packages/core-components/src/components/table/table-row/table-row.tsx
@@ -98,7 +98,7 @@ export class TableRowComponent {
   }
 
   disconnectedCallback() {
-    if (this.observer) {
+    if (this.observer !== undefined && this.observer !== null) {
       this.observer.disconnect();
       this.observer = null;
     }