diff --git a/src/viewerModule/threeSurfer/threeSurferGlue/threeSurfer.component.ts b/src/viewerModule/threeSurfer/threeSurferGlue/threeSurfer.component.ts
index bbc5a04f012a030dfb7cbbb518df7586f3371ed6..5422e8a3bcc523530fe4773cb4586ef415cb651b 100644
--- a/src/viewerModule/threeSurfer/threeSurferGlue/threeSurfer.component.ts
+++ b/src/viewerModule/threeSurfer/threeSurferGlue/threeSurfer.component.ts
@@ -155,6 +155,10 @@ export class ThreeSurferGlueCmp implements IViewer<'threeSurfer'>, OnChanges, Af
       })
     }
 
+    this.onDestroyCb.push(
+      () => setViewerHandle(null)
+    )
+
     if (this.roi$) {
       const sub = this.roi$.pipe(
         switchMap(switchMapWaitFor({