diff --git a/src/components/Copy/Copy.svelte b/src/components/Copy/Copy.svelte
index 6b83ec63..f7fbf910 100644
--- a/src/components/Copy/Copy.svelte
+++ b/src/components/Copy/Copy.svelte
@@ -11,10 +11,8 @@
   let timeoutId = undefined;
 
   onDestroy(() => {
-    if (timeoutId !== undefined) {
-      window.clearTimeout(timeoutId);
-      timeoutId = undefined;
-    }
+    window.clearTimeout(timeoutId);
+    timeoutId = undefined;
   });
 
   $: showFeedback = timeoutId !== undefined;
diff --git a/src/components/CopyButton/CopyButton.svelte b/src/components/CopyButton/CopyButton.svelte
index 8cc77904..0562f7c4 100644
--- a/src/components/CopyButton/CopyButton.svelte
+++ b/src/components/CopyButton/CopyButton.svelte
@@ -6,19 +6,25 @@
   export let feedbackTimeout = 2000;
   export let style = undefined;
 
-  import { onDestroy } from 'svelte';
+  import { afterUpdate, onDestroy } from 'svelte';
   import Copy16 from 'carbon-icons-svelte/lib/Copy16';
   import { cx } from '../../lib';
 
   let animation = undefined;
   let timeoutId = undefined;
 
-  onDestroy(() => {
-    if (timeoutId !== undefined) {
-      window.clearTimeout(timeoutId);
-      timeoutId = undefined;
+  afterUpdate(() => {
+    if (animation === 'fade-in') {
+      timeoutId = window.setTimeout(() => {
+        animation = 'fade-out';
+      }, feedbackTimeout);
     }
   });
+
+  onDestroy(() => {
+    window.clearTimeout(timeoutId);
+    timeoutId = undefined;
+  });
 </script>
 
 <button
@@ -30,9 +36,6 @@
   on:click
   on:click={() => {
     animation = 'fade-in';
-    timeoutId = window.setTimeout(() => {
-      animation = 'fade-out';
-    }, feedbackTimeout);
   }}
   on:mouseover
   on:mouseenter
diff --git a/src/components/InlineLoading/InlineLoading.svelte b/src/components/InlineLoading/InlineLoading.svelte
index 18e03da9..236e9e1d 100644
--- a/src/components/InlineLoading/InlineLoading.svelte
+++ b/src/components/InlineLoading/InlineLoading.svelte
@@ -7,7 +7,7 @@
   export let successDelay = 1500;
   export let style = undefined;
 
-  import { createEventDispatcher, onDestroy } from 'svelte';
+  import { createEventDispatcher, afterUpdate, onDestroy } from 'svelte';
   import CheckmarkFilled16 from 'carbon-icons-svelte/lib/CheckmarkFilled16';
   import Error20 from 'carbon-icons-svelte/lib/Error20';
   import { cx } from '../../lib';
@@ -17,18 +17,18 @@
 
   let timeoutId = undefined;
 
-  onDestroy(() => {
-    if (timeoutId !== undefined) {
-      window.clearTimeout(timeoutId);
-      timeoutId = undefined;
+  afterUpdate(() => {
+    if (status === 'finished') {
+      timeoutId = window.setTimeout(() => {
+        dispatch('success');
+      }, successDelay);
     }
   });
 
-  $: if (status === 'finished') {
-    timeoutId = window.setTimeout(() => {
-      dispatch('success');
-    }, successDelay);
-  }
+  onDestroy(() => {
+    window.clearTimeout(timeoutId);
+    timeoutId = undefined;
+  });
 </script>
 
 <div