diff --git a/src/components/carousel/carousel.ts b/src/components/carousel/carousel.ts
index f7573682f..be86f009a 100644
--- a/src/components/carousel/carousel.ts
+++ b/src/components/carousel/carousel.ts
@@ -107,7 +107,7 @@ export default class WaCarousel extends WebAwesomeElement {
 
   disconnectedCallback(): void {
     super.disconnectedCallback();
-    this.mutationObserver.disconnect();
+    this.mutationObserver?.disconnect();
   }
 
   protected firstUpdated(): void {
diff --git a/src/components/details/details.ts b/src/components/details/details.ts
index 6aecffb38..842c9ed53 100644
--- a/src/components/details/details.ts
+++ b/src/components/details/details.ts
@@ -93,7 +93,7 @@ export default class WaDetails extends WebAwesomeElement {
 
   disconnectedCallback() {
     super.disconnectedCallback();
-    this.detailsObserver.disconnect();
+    this.detailsObserver?.disconnect();
   }
 
   private handleSummaryClick(event: MouseEvent) {
diff --git a/src/components/range/range.ts b/src/components/range/range.ts
index 018238622..489e1e2d9 100644
--- a/src/components/range/range.ts
+++ b/src/components/range/range.ts
@@ -131,7 +131,7 @@ export default class WaRange extends WebAwesomeFormAssociatedElement {
 
   disconnectedCallback() {
     super.disconnectedCallback();
-    this.resizeObserver.unobserve(this.input);
+    this.resizeObserver?.unobserve(this.input);
   }
 
   private handleChange() {
diff --git a/src/components/split-panel/split-panel.ts b/src/components/split-panel/split-panel.ts
index 04cde55e3..884d450cb 100644
--- a/src/components/split-panel/split-panel.ts
+++ b/src/components/split-panel/split-panel.ts
@@ -88,7 +88,7 @@ export default class WaSplitPanel extends WebAwesomeElement {
 
   disconnectedCallback() {
     super.disconnectedCallback();
-    this.resizeObserver.unobserve(this);
+    this.resizeObserver?.unobserve(this);
   }
 
   private detectSize() {
diff --git a/src/components/tab-group/tab-group.ts b/src/components/tab-group/tab-group.ts
index 5e3e8f509..5a102e9df 100644
--- a/src/components/tab-group/tab-group.ts
+++ b/src/components/tab-group/tab-group.ts
@@ -128,8 +128,8 @@ export default class WaTabGroup extends WebAwesomeElement {
 
   disconnectedCallback() {
     super.disconnectedCallback();
-    this.mutationObserver.disconnect();
-    this.resizeObserver.unobserve(this.nav);
+    this.mutationObserver?.disconnect();
+    this.resizeObserver?.unobserve(this.nav);
   }
 
   private getAllTabs() {
diff --git a/src/components/textarea/textarea.ts b/src/components/textarea/textarea.ts
index b4e11c84c..835d02373 100644
--- a/src/components/textarea/textarea.ts
+++ b/src/components/textarea/textarea.ts
@@ -163,7 +163,7 @@ export default class WaTextarea extends WebAwesomeFormAssociatedElement {
   disconnectedCallback() {
     super.disconnectedCallback();
     if (this.input) {
-      this.resizeObserver.unobserve(this.input);
+      this.resizeObserver?.unobserve(this.input);
     }
   }
 
diff --git a/src/components/tree/tree.ts b/src/components/tree/tree.ts
index 4dff840cc..0585bca5f 100644
--- a/src/components/tree/tree.ts
+++ b/src/components/tree/tree.ts
@@ -116,7 +116,7 @@ export default class WaTree extends WebAwesomeElement {
   disconnectedCallback() {
     super.disconnectedCallback();
 
-    this.mutationObserver.disconnect();
+    this.mutationObserver?.disconnect();
   }
 
   // Generates a clone of the expand icon element to use for each tree item