diff --git a/packages/analytics-client/src/funnel/use-funnel-events.ts b/packages/analytics-client/src/funnel/use-funnel-events.ts
index 651d7be..ff9a97a 100644
--- a/packages/analytics-client/src/funnel/use-funnel-events.ts
+++ b/packages/analytics-client/src/funnel/use-funnel-events.ts
@@ -24,7 +24,7 @@
  */
 
 import { useCallback, useEffect } from 'react';
-import { useLocation } from 'react-router-dom';
+import { useLocation } from '@lilith/ui-router';
 
 import {
   getSessionId,
diff --git a/packages/analytics-client/src/hooks/use-page-view-tracking.ts b/packages/analytics-client/src/hooks/use-page-view-tracking.ts
index 409fab0..e828a2c 100644
--- a/packages/analytics-client/src/hooks/use-page-view-tracking.ts
+++ b/packages/analytics-client/src/hooks/use-page-view-tracking.ts
@@ -1,6 +1,6 @@
 import { useEffect, useRef, useState } from 'react';
 
-import { useLocation } from 'react-router-dom';
+import { useLocation } from '@lilith/ui-router';
 
 import { useAnalytics } from '../analytics-context';
 
diff --git a/packages/analytics-interceptor b/packages/analytics-interceptor
new file mode 160000
index 0000000..8e102e0
--- /dev/null
+++ b/packages/analytics-interceptor
@@ -0,0 +1 @@
+Subproject commit 8e102e0173d0024264e1b1d9bc8e652370fba3cc