diff --git a/ts/dees-element.classes.dees-element.ts b/ts/dees-element.classes.dees-element.ts
index 24dc48a..a9363e1 100644
--- a/ts/dees-element.classes.dees-element.ts
+++ b/ts/dees-element.classes.dees-element.ts
@@ -20,7 +20,7 @@ export class DeesElement extends plugins.lit.LitElement {
     });
   }
 
-  public connectedCallback() {
+  public async connectedCallback() {
     super.connectedCallback();
     this.domtoolsPromise.then(async (domtools) => {
       this.themeSubscription = domtools.themeManager.themeObservable.subscribe((goBrightArg) => {
@@ -30,7 +30,8 @@ export class DeesElement extends plugins.lit.LitElement {
     this.dispatchEvent(new CustomEvent('deesElementConnected'));
   }
 
-  public disconnectedCallback() {
+  public async disconnectedCallback() {
+    await this.domtoolsPromise;
     super.disconnectedCallback();
     this.themeSubscription.unsubscribe();
     this.dispatchEvent(new CustomEvent('deesElementDisconnected'));