diff --git a/frontend/app/player/web/Screen/Screen.ts b/frontend/app/player/web/Screen/Screen.ts
index d85857b01..92479a4af 100644
--- a/frontend/app/player/web/Screen/Screen.ts
+++ b/frontend/app/player/web/Screen/Screen.ts
@@ -83,9 +83,9 @@ export default class Screen {
   }
 
   clean() {
-    this.screen.removeChild(this.iframe)
-    this.screen.removeChild(this.overlay)
-    this.screen.remove();
+    this.iframe?.remove?.();
+    this.overlay?.remove?.();
+    this.screen?.remove?.();
   }
 
   attach(parentElement: HTMLElement) {
diff --git a/frontend/app/player/web/WebPlayer.ts b/frontend/app/player/web/WebPlayer.ts
index 63007214e..c44ddc7b2 100644
--- a/frontend/app/player/web/WebPlayer.ts
+++ b/frontend/app/player/web/WebPlayer.ts
@@ -137,7 +137,7 @@ export default class WebPlayer extends Player {
   }
 
   showClickmap = (...args: Parameters<TargetMarker['injectTargets']>) => {
-    this.screen.overlay.remove() // hack. TODO: 1.split Screen functionalities (overlay, mounter) 2. separate ClickMapPlayer class that does not create overlay
+    this.screen?.overlay?.remove?.() // hack. TODO: 1.split Screen functionalities (overlay, mounter) 2. separate ClickMapPlayer class that does not create overlay
     this.freeze().then(() => {
       this.targetMarker.injectTargets(...args)
     })