diff --git a/packages/bridge-ui-v2/src/libs/wagmi/watcher.ts b/packages/bridge-ui-v2/src/libs/wagmi/watcher.ts
index a9149be9cd6..16fa32acfd4 100644
--- a/packages/bridge-ui-v2/src/libs/wagmi/watcher.ts
+++ b/packages/bridge-ui-v2/src/libs/wagmi/watcher.ts
@@ -1,8 +1,8 @@
-import { watchAccount, watchNetwork, watchPublicClient, watchWalletClient } from '@wagmi/core';
+import { watchAccount, watchNetwork /*, watchPublicClient, watchWalletClient*/ } from '@wagmi/core';
 
 import { getLogger } from '$libs/util/logger';
 
-const log = getLogger('wagmi/watcher');
+const log = getLogger('wagmi:watcher');
 
 let isWatching = false;
 let unWatchNetwork: () => void;
diff --git a/packages/bridge-ui-v2/src/routes/+layout.svelte b/packages/bridge-ui-v2/src/routes/+layout.svelte
index 8d65d94a27f..b18ed3d420e 100644
--- a/packages/bridge-ui-v2/src/routes/+layout.svelte
+++ b/packages/bridge-ui-v2/src/routes/+layout.svelte
@@ -1,8 +1,14 @@
 <script lang="ts">
   import '../app.css';
 
+  import { onDestroy, onMount } from 'svelte';
+
   import Header from '$components/Header';
   import SideNavigation from '$components/SideNavigation';
+  import { startWatching, stopWatching } from '$libs/wagmi';
+
+  onMount(startWatching);
+  onDestroy(stopWatching);
 </script>
 
 <SideNavigation>
diff --git a/packages/bridge-ui-v2/src/routes/+layout.ts b/packages/bridge-ui-v2/src/routes/+layout.ts
index 92d449c4cde..17153886b0a 100644
--- a/packages/bridge-ui-v2/src/routes/+layout.ts
+++ b/packages/bridge-ui-v2/src/routes/+layout.ts
@@ -1,13 +1,4 @@
-/**
- * Entry point
- */
-
-import { startWatching } from '$libs/wagmi';
-
 // When setting this to false your entire app will only be rendered on the client,
 // which essentially means you turn your app into an SPA.
 // See https://kit.svelte.dev/docs/page-options#ssr
 export const ssr = false;
-
-// Start watching for network and account changes
-startWatching();
diff --git a/packages/bridge-ui-v2/vite.config.ts b/packages/bridge-ui-v2/vite.config.ts
index 83e51c7015b..808b49b4332 100644
--- a/packages/bridge-ui-v2/vite.config.ts
+++ b/packages/bridge-ui-v2/vite.config.ts
@@ -3,6 +3,9 @@ import tsconfigPaths from 'vite-tsconfig-paths';
 import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
+  build: {
+    sourcemap: true,
+  },
   plugins: [
     sveltekit(),