diff --git a/src/ComposedModal/ComposedModal.svelte b/src/ComposedModal/ComposedModal.svelte
index 47f1c36e..5d5eaed5 100644
--- a/src/ComposedModal/ComposedModal.svelte
+++ b/src/ComposedModal/ComposedModal.svelte
@@ -47,6 +47,7 @@
     setContext,
     onMount,
     afterUpdate,
+    onDestroy,
   } from "svelte";
 
   const dispatch = createEventDispatcher();
@@ -79,12 +80,12 @@
   onMount(async () => {
     await tick();
     focus();
-
-    return () => {
-      document.body.classList.remove("bx--body--with-modal-open");
-    };
   });
 
+  onDestroy(() => {
+    document.body.classList.remove("bx--body--with-modal-open");
+  })
+
   afterUpdate(() => {
     if (opened) {
       if (!open) {