diff --git a/packages/vue-query-devtools/src/devtools.vue b/packages/vue-query-devtools/src/devtools.vue
index d4e5482f9a6..09396d5750b 100644
--- a/packages/vue-query-devtools/src/devtools.vue
+++ b/packages/vue-query-devtools/src/devtools.vue
@@ -31,12 +31,15 @@ watchEffect(() => {
   devtools.setTheme(props.theme || 'system')
 })
 
+let mounted = false
+
 onMounted(() => {
   devtools.mount(div.value as HTMLElement)
+  mounted = true
 })
 
 onScopeDispose(() => {
-  devtools.unmount()
+  if (mounted) devtools.unmount()
 })
 </script>
 
diff --git a/packages/vue-query-devtools/src/devtoolsPanel.vue b/packages/vue-query-devtools/src/devtoolsPanel.vue
index 21aaa90c033..8a27dc66827 100644
--- a/packages/vue-query-devtools/src/devtoolsPanel.vue
+++ b/packages/vue-query-devtools/src/devtoolsPanel.vue
@@ -36,12 +36,15 @@ watchEffect(() => {
   devtools.setTheme(props.theme)
 })
 
+let mounted = false
+
 onMounted(() => {
   devtools.mount(div.value as HTMLElement)
+  mounted = true
 })
 
 onScopeDispose(() => {
-  devtools.unmount()
+  if (mounted) devtools.unmount()
 })
 </script>