diff --git a/apps/remix-ide/src/assets/js/loader.js b/apps/remix-ide/src/assets/js/loader.js
index a8c5692052..51887984c7 100644
--- a/apps/remix-ide/src/assets/js/loader.js
+++ b/apps/remix-ide/src/assets/js/loader.js
@@ -15,6 +15,8 @@ const domainsSecondaryTracker = {
 if (domains[window.location.hostname]) {
   var _paq = window._paq = window._paq || []
   /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+  _paq.push(["setExcludedQueryParams", ["code","gist"]]);
+  _paq.push(["setExcludedReferrers", ["etherscan.io"]]);
   _paq.push(['disableCookies']);
   _paq.push(['enableJSErrorTracking']);
   _paq.push(['trackPageView']);
@@ -25,15 +27,15 @@ if (domains[window.location.hostname]) {
     _paq.push(['optUserOut'])
   }
   (function () {
-    var u = "https://matomo.ethereum.org/";
-    _paq.push(['setTrackerUrl', u + 'matomo.php'])
-    _paq.push(['setSiteId', domains[window.location.hostname]])
-    // Send all of the Remix tracking data to the secondary Matomo server    
-    var secondaryTracker = 'https://ethereumfoundation.matomo.cloud/matomo.php';
+    var u = "https://ethereumfoundation.matomo.cloud/";
+    _paq.push(['setTrackerUrl', u + 'matomo.php']);
+    _paq.push(['setSiteId', domains[window.location.hostname]]);
+    // Send all of the Remix tracking data to the secondary Matomo server (the EF one).
+    var secondaryTracker = 'https://matomo.ethereum.org/matomo.php';
     var secondaryWebsiteId = domainsSecondaryTracker[window.location.hostname];
     _paq.push(['addTracker', secondaryTracker, secondaryWebsiteId]);    
-    var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0]
-    g.type = 'text/javascript'; g.async = true; g.src = u + 'matomo.js'; s.parentNode.insertBefore(g, s)
+    var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
+    g.async = true; g.src = '//cdn.matomo.cloud/ethereumfoundation.matomo.cloud/matomo.js'; s.parentNode.insertBefore(g,s);
   })()
 }