diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 6943a47..32089ff 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,5 +1,7 @@
 import localFont from "next/font/local";
 import classNames from "classnames";
+import {Suspense} from "react";
+import {Metrika} from "@/shared/components/Metrika/Metrika";
 
 const helveticaNeueCyrFont = localFont({
     src: '../shared/assets/fonts/HelveticaNeueCyr-Bold.ttf',
@@ -46,25 +48,11 @@ export default function RootLayout({
             <title>Дропшиппинг DENCO Seller | Автоматическая система продажи на маркетплейсах</title>
             <meta name="description"
                   content="DENCO seller — Дропшиппинг, фулфилмент и внутренняя аналитика в одном сервисе. Бизнес на маркетплейсах из любой точки мира..."/>
-
         </head>
         <body>{children}</body>
-        <script dangerouslySetInnerHTML={{
-            __html: `
-           (function(m,e,t,r,i,k,a){m[i]=m[i]function(){(m[i].a=m[i].a[]).push(arguments)};
-   m[i].l=1*new Date();
-   for (var j = 0; j < document.scripts.length; j++) {if (document.scripts[j].src === r) { return; }}
-   k=e.createElement(t),a=e.getElementsByTagName(t)[0],k.async=1,k.src=r,a.parentNode.insertBefore(k,a)})
-   (window, document, "script", "https://mc.yandex.ru/metrika/tag.js", "ym");
-
-   ym(97192033, "init", {
-        clickmap:true,
-        trackLinks:true,
-        accurateTrackBounce:true,
-        webvisor:true
-   });
-        `
-        }}/>
+        <Suspense>
+            <Metrika/>
+        </Suspense>
         <noscript>
             <div><img src="https://mc.yandex.ru/watch/97192033" style={{position: 'absolute', left: "-9999px"}} alt=""/>
             </div>
diff --git a/src/shared/components/Metrika/Metrika.tsx b/src/shared/components/Metrika/Metrika.tsx
new file mode 100644
index 0000000..704945a
--- /dev/null
+++ b/src/shared/components/Metrika/Metrika.tsx
@@ -0,0 +1,34 @@
+"use client";
+
+import {useEffect} from "react";
+import {usePathname, useSearchParams} from "next/navigation";
+import Script from "next/script";
+
+export function Metrika() {
+    const pathName = usePathname();
+    const searchParams = useSearchParams();
+    useEffect(() => {
+
+        // @ts-ignore
+        ym(97192033, "hit", window.location.href);
+    }, [pathName, searchParams]);
+    return (
+        <Script id="yandex-metrika">
+            {`
+          (function(m,e,t,r,i,k,a){m[i]=m[i]||function(){(m[i].a=m[i].a||[]).push(arguments)};
+   m[i].l=1*new Date();
+   for (var j = 0; j < document.scripts.length; j++) {if (document.scripts[j].src === r) { return; }}
+   k=e.createElement(t),a=e.getElementsByTagName(t)[0],k.async=1,k.src=r,a.parentNode.insertBefore(k,a)})
+   (window, document, "script", "https://mc.yandex.ru/metrika/tag.js", "ym");
+
+   ym(97192033, "init", {
+        clickmap:true,
+        trackLinks:true,
+        accurateTrackBounce:true,
+        webvisor:true,
+        defer:true
+   });
+      `}
+        </Script>
+    );
+}
\ No newline at end of file
