diff --git a/tobago-theme/tobago-theme-standard/src/main/npm/ts/tobago-focus.ts b/tobago-theme/tobago-theme-standard/src/main/npm/ts/tobago-focus.ts
index beab956..e54fd9c 100644
--- a/tobago-theme/tobago-theme-standard/src/main/npm/ts/tobago-focus.ts
+++ b/tobago-theme/tobago-theme-standard/src/main/npm/ts/tobago-focus.ts
@@ -98,8 +98,12 @@
 
   private get lastFocusedElement(): HTMLElement {
     const lastFocusId: string = this.hiddenInput.value;
-    const root = this.getRootNode() as ShadowRoot | Document;
-    return root.getElementById(lastFocusId);
+    if (lastFocusId) {
+      const root = this.getRootNode() as ShadowRoot | Document;
+      return root.getElementById(lastFocusId);
+    } else {
+      return null;
+    }
   }
 
   private get hiddenInput(): HTMLInputElement {