diff --git a/website/api/helpers/salesforce/update-or-create-contact-and-account.js b/website/api/helpers/salesforce/update-or-create-contact-and-account.js
index bbfe9f7f174..7843678502f 100644
--- a/website/api/helpers/salesforce/update-or-create-contact-and-account.js
+++ b/website/api/helpers/salesforce/update-or-create-contact-and-account.js
@@ -278,8 +278,18 @@ module.exports = {
         // If no medium was provided via utm parameter, set the source channel to "Organic".
         attributionDetails.sourceChannel = 'Organic';
 
-        if(!marketingAttributionCookie.referrer || marketingAttributionCookie.referrer === 'https://fleetdm.com/') {
-          // If no referrer is set, or the referrer is set to the Fleet website, we'll assume this user came to the website directly
+        let isFleetReferrer = false;
+        if(marketingAttributionCookie.referrer) {
+          try {
+            let parsedReferrerUrl = new URL(marketingAttributionCookie.referrer);
+            let referrerHost = parsedReferrerUrl.hostname.toLowerCase();
+            isFleetReferrer = (referrerHost === 'fleetdm.com' || referrerHost.endsWith('.fleetdm.com'));
+          } catch (unused) {
+            isFleetReferrer = false;
+          }
+        }
+        if(!marketingAttributionCookie.referrer || isFleetReferrer) {
+          // If no referrer is set, or the referrer is any fleetdm.com page, we'll assume this user came to the website directly
           attributionDetails.sourceChannelDetails = 'Direct traffic (DT)';
           attributionDetails.campaign = 'Default-DT-Direct';
         } else {
diff --git a/website/views/layouts/layout.ejs b/website/views/layouts/layout.ejs
index 080457066cc..5413d04ae08 100644
--- a/website/views/layouts/layout.ejs
+++ b/website/views/layouts/layout.ejs
@@ -40,15 +40,27 @@
       function gtag() {
           dataLayer.push(arguments);
       }
+      // Non-EU/UK visitors: grant analytics immediately (no consent banner shown)
       gtag("consent", "default", {
           ad_storage: "denied",
-          ad_user_data: "denied", 
+          ad_user_data: "denied",
+          ad_personalization: "denied",
+          analytics_storage: "granted",
+          functionality_storage: "granted",
+          personalization_storage: "denied",
+          security_storage: "granted",
+      });
+      // EU/EEA/UK/Switzerland: deny everything, wait for CookieYes banner
+      gtag("consent", "default", {
+          ad_storage: "denied",
+          ad_user_data: "denied",
           ad_personalization: "denied",
           analytics_storage: "denied",
           functionality_storage: "denied",
           personalization_storage: "denied",
           security_storage: "granted",
           wait_for_update: 2000,
+          region: ["AT","BE","BG","HR","CY","CZ","DK","EE","FI","FR","DE","GR","HU","IE","IT","LV","LT","LU","MT","NL","PL","PT","RO","SK","SI","ES","SE","IS","LI","NO","GB","CH"],
       });
       gtag("set", "ads_data_redaction", true);
     </script>