diff --git a/package.json b/package.json
index 8bd3584..3a8088a 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
 	},
 	"homepage": "https://github.com/prgm-dev/sveltekit-progress-bar#readme",
 	"license": "MIT",
-	"version": "3.0.0",
+	"version": "3.0.1-next.1",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/prgm-dev/sveltekit-progress-bar.git"
diff --git a/src/lib/ProgressBar.svelte b/src/lib/ProgressBar.svelte
index f741282..2e120a0 100644
--- a/src/lib/ProgressBar.svelte
+++ b/src/lib/ProgressBar.svelte
@@ -9,7 +9,7 @@
 <svelte:options runes={true} />
 
 <script lang="ts">
-  import { afterNavigate, beforeNavigate } from "$app/navigation";
+  import { beforeNavigate } from "$app/navigation";
 
   // This component is a modified version of the component from the following repo:
   // https://github.com/saibotsivad/svelte-progress-bar
@@ -245,9 +245,8 @@
       `view-transition-name: ${viewTransitionName}-leader;`,
   );
 
-  let progressBarStartTimeout = $state<ReturnType<typeof setTimeout> | null>(
-    null,
-  );
+  let progressBarStartTimeout: ReturnType<typeof setTimeout> | null = null;
+
   beforeNavigate((nav) => {
     if (progressBarStartTimeout) {
       clearTimeout(progressBarStartTimeout);
@@ -265,15 +264,15 @@
           displayThresholdMs,
         );
       } else start();
-    }
-  });
 
-  afterNavigate(() => {
-    if (progressBarStartTimeout) {
-      clearTimeout(progressBarStartTimeout);
-      progressBarStartTimeout = null;
+      nav.complete.catch().finally(() => {
+        if (progressBarStartTimeout) {
+          clearTimeout(progressBarStartTimeout);
+          progressBarStartTimeout = null;
+        }
+        complete();
+      });
     }
-    complete();
   });
 </script>