diff --git a/GanjooRazor/appsettings.json b/GanjooRazor/appsettings.json
index e9fc2e0c..d70e01c8 100644
--- a/GanjooRazor/appsettings.json
+++ b/GanjooRazor/appsettings.json
@@ -7,7 +7,6 @@
     }
   },
   "AllowedHosts": "*",
-  "GoogleAnalyticsCode": "",
   "TrackingScript": "<script src='https://cdn.kntr.ir/tracker.js'></script><script>kntrTracking.startTracking(\"2\", \"loggedon\");</script>",
   "APIRoot": "https://api.ganjoor.net",
   "GlobalAPIRoot": "https://api.ganjoor.net",
diff --git a/TajikGanjoor/Pages/Index.cshtml.cs b/TajikGanjoor/Pages/Index.cshtml.cs
index 453347cc..e1f62177 100644
--- a/TajikGanjoor/Pages/Index.cshtml.cs
+++ b/TajikGanjoor/Pages/Index.cshtml.cs
@@ -242,7 +242,7 @@ namespace TajikGanjoor.Pages
                 ViewData["Title"] = title;
             }
             ViewData["BreadCrumpUrls"] = BreadCrumpUrls;
-            ViewData["GoogleAnalyticsCode"] = Configuration["GoogleAnalyticsCode"];
+            ViewData["TrackingScript"] = Configuration["TrackingScript"] != null && string.IsNullOrEmpty(Request.Cookies["Token"]) ? Configuration["TrackingScript"].Replace("loggedon", "") : Configuration["TrackingScript"];
             ViewData["GoogleTranslateLink"] = $"https://translate.google.com/translate?hl=fa&sl=fa&tl=tg&u={Uri.EscapeDataString(stringToEscape: $"https://ganjoor.net{Request.Path}")}";
             ViewData["NextUrl"] = NextUrl;
             ViewData["PreviousUrl"] = PreviousUrl;
diff --git a/TajikGanjoor/Pages/Shared/_Layout.cshtml b/TajikGanjoor/Pages/Shared/_Layout.cshtml
index d3210f90..7f1beee8 100644
--- a/TajikGanjoor/Pages/Shared/_Layout.cshtml
+++ b/TajikGanjoor/Pages/Shared/_Layout.cshtml
@@ -46,18 +46,9 @@
     @await RenderSectionAsync("Scripts", required: false)
 
 
-    @if (ViewData["GoogleAnalyticsCode"] != null && !string.IsNullOrEmpty(ViewData["GoogleAnalyticsCode"].ToString()))
+    @if (ViewData["TrackingScript"] != null && !string.IsNullOrEmpty(ViewData["TrackingScript"].ToString()))
     {
-
-        <!-- Google tag (gtag.js) -->
-        <script async src="https://www.googletagmanager.com/gtag/js?id=@(ViewData["GoogleAnalyticsCode"])"></script>
-        <script>
-            window.dataLayer = window.dataLayer || [];
-            function gtag() { dataLayer.push(arguments); }
-            gtag('js', new Date());
-
-            gtag('config', '@(ViewData["GoogleAnalyticsCode"])');
-        </script>
+        @Html.Raw(ViewData["TrackingScript"])
     }
 
 </body>
diff --git a/TajikGanjoor/appsettings.json b/TajikGanjoor/appsettings.json
index de547ab5..20740084 100644
--- a/TajikGanjoor/appsettings.json
+++ b/TajikGanjoor/appsettings.json
@@ -6,7 +6,7 @@
     }
   },
   "AllowedHosts": "*",
-  "GoogleAnalyticsCode": "",
+  "TrackingScript": "<script src='https://cdn.kntr.ir/tracker.js'></script><script>kntrTracking.startTracking(\"2\", \"loggedon\");</script>",
   "APIRoot": "https://api.ganjoor.net",
   "GlobalAPIRoot": "https://api.ganjoor.net",
   "SiteUrl": "http://localhost:33082",