diff --git a/src/components/pages/settings/websites/ShareUrl.js b/src/components/pages/settings/websites/ShareUrl.js
index a7b7fc2f..f4569ca3 100644
--- a/src/components/pages/settings/websites/ShareUrl.js
+++ b/src/components/pages/settings/websites/ShareUrl.js
@@ -16,7 +16,7 @@ import useMessages from 'components/hooks/useMessages';
 
 const generateId = () => getRandomChars(16);
 
-export function ShareUrl({ websiteId, data, onSave }) {
+export function ShareUrl({ websiteId, data, analyticsUrl, onSave }) {
   const { formatMessage, labels, messages } = useMessages();
   const { name, shareId } = data;
   const [id, setId] = useState(shareId);
@@ -27,10 +27,7 @@ export function ShareUrl({ websiteId, data, onSave }) {
   );
   const ref = useRef(null);
   const url = useMemo(
-    () =>
-      `${process.env.analyticsUrl || location.origin}${basePath}/share/${id}/${encodeURIComponent(
-        name,
-      )}`,
+    () => `${analyticsUrl || location.origin}${basePath}/share/${id}/${encodeURIComponent(name)}`,
     [id, name, basePath],
   );
 
diff --git a/src/components/pages/settings/websites/TrackingCode.js b/src/components/pages/settings/websites/TrackingCode.js
index 03dd6a1d..298cd17a 100644
--- a/src/components/pages/settings/websites/TrackingCode.js
+++ b/src/components/pages/settings/websites/TrackingCode.js
@@ -3,7 +3,7 @@ import useMessages from 'components/hooks/useMessages';
 import useConfig from 'components/hooks/useConfig';
 import { useRouter } from 'next/router';
 
-export function TrackingCode({ websiteId, baseUrl }) {
+export function TrackingCode({ websiteId, analyticsUrl }) {
   const { formatMessage, messages } = useMessages();
   const { basePath } = useRouter();
   const config = useConfig();
@@ -13,7 +13,7 @@ export function TrackingCode({ websiteId, baseUrl }) {
 
   const url = trackerScriptName?.startsWith('http')
     ? trackerScriptName
-    : `${baseUrl || location.origin}${basePath}/${trackerScriptName}`;
+    : `${analyticsUrl || location.origin}${basePath}/${trackerScriptName}`;
 
   const code = `<script async src="${url}" data-website-id="${websiteId}"></script>`;
 
diff --git a/src/components/pages/settings/websites/WebsiteSettings.js b/src/components/pages/settings/websites/WebsiteSettings.js
index 3cd4185c..63e89814 100644
--- a/src/components/pages/settings/websites/WebsiteSettings.js
+++ b/src/components/pages/settings/websites/WebsiteSettings.js
@@ -69,7 +69,14 @@ export function WebsiteSettings({ websiteId, openExternal = false, analyticsUrl
         <WebsiteEditForm websiteId={websiteId} data={values} onSave={handleSave} />
       )}
       {tab === 'tracking' && <TrackingCode websiteId={websiteId} analyticsUrl={analyticsUrl} />}
-      {tab === 'share' && <ShareUrl websiteId={websiteId} data={values} onSave={handleSave} />}
+      {tab === 'share' && (
+        <ShareUrl
+          websiteId={websiteId}
+          data={values}
+          analyticsUrl={analyticsUrl}
+          onSave={handleSave}
+        />
+      )}
       {tab === 'data' && <WebsiteData websiteId={websiteId} onSave={handleReset} />}
     </Page>
   );