1 files changed, 5 insertions, 1 deletions
diff --git a/js/piwik.js b/js/piwik.js
index 1ba2d01853..4783eba905 100644
--- a/js/piwik.js
+++ b/js/piwik.js
@@ -4371,7 +4371,7 @@ if (typeof window.Piwik !== 'object') {
 
             function getCrossDomainVisitorId()
             {
-                var visitorId = getValuesFromVisitorIdCookie().uuid;
+                var visitorId = trackerInstance.getVisitorId();
                 var deviceId = makeCrossDomainDeviceId();
                 return visitorId + deviceId;
             }
@@ -4392,6 +4392,10 @@ if (typeof window.Piwik !== 'object') {
                     return;
                 }
 
+                if (!trackerInstance.getVisitorId()) {
+                    return; // cookies are disabled.
+                }
+
                 // we need to remove the parameter and add it again if needed to make sure we have latest timestamp
                 // and visitorId (eg userId might be set etc)
                 link = removeUrlParameter(link, configVisitorIdUrlParameter);