diff --git a/src/interaction/tooltip.ts b/src/interaction/tooltip.ts
index 9dc99b9836..2bd781529f 100644
--- a/src/interaction/tooltip.ts
+++ b/src/interaction/tooltip.ts
@@ -864,7 +864,6 @@ export function tooltip(
       root.removeEventListener('pointermove', pointerover);
       root.removeEventListener('pointerout', pointerout);
     }
-    destroyTooltip({ root, single });
   };
 
   const onTooltipShow = ({ nativeEvent, data }) => {
diff --git a/src/runtime/plot.ts b/src/runtime/plot.ts
index 20dcae4558..72ca9435dc 100644
--- a/src/runtime/plot.ts
+++ b/src/runtime/plot.ts
@@ -424,8 +424,8 @@ function updateTooltip(
     container: selection.node(),
     update: (options) => Promise.resolve(options),
   };
-  const newTooltip = applyTooltip(target, [], context.emitter);
-  nameInteraction.set('tooltip', newTooltip);
+  const destroy = applyTooltip(target, [], context.emitter);
+  nameInteraction.set('tooltip', { destroy });
 }
 
 async function initializeView(