diff --git a/server/server.js b/server/server.js
index a0951e51..24e1d418 100644
--- a/server/server.js
+++ b/server/server.js
@@ -69,9 +69,15 @@ app.use('/l20n', express.static(L20N));
 app.use('/locales', express.static(LOCALES));
 
 app.get('/', (req, res) => {
-  res.render('index', {
+  res.render('index');
+});
+
+app.get('/jsconfig.js', (req, res) => {
+  res.set('Content-Type', 'application/javascript');
+  res.render('jsconfig', {
     trackerId: conf.analytics_id,
-    dsn: conf.sentry_id
+    dsn: conf.sentry_id,
+    layout: false
   });
 });
 
diff --git a/views/jsconfig.handlebars b/views/jsconfig.handlebars
new file mode 100644
index 00000000..1e960e83
--- /dev/null
+++ b/views/jsconfig.handlebars
@@ -0,0 +1,6 @@
+{{#if dsn}}
+window.dsn = '{{{dsn}}}';
+{{/if}}
+{{#if trackerId}}
+window.trackerId = '{{{trackerId}}}';
+{{/if}}
diff --git a/views/layouts/main.handlebars b/views/layouts/main.handlebars
index d3a660ba..285ad3c7 100644
--- a/views/layouts/main.handlebars
+++ b/views/layouts/main.handlebars
@@ -2,15 +2,10 @@
 <html>
 <head>
   <title>Firefox Send</title>
-  {{#if dsn}}
-  {{> sentry dsn=dsn}}
-  {{/if}}
+  <script src="/jsconfig.js"></script>
   <script src="/bundle.js"></script>
   <link rel="stylesheet" type="text/css" href="/main.css" />
   <link rel="stylesheet" href="https://code.cdn.mozilla.net/fonts/fira.css">
-  {{#if trackerId}}
-  {{> analytics trackerId=trackerId}}
-  {{/if}}
 
   <meta name="defaultLanguage" content="en-US">
   <meta name="availableLanguages" content="en-US">
diff --git a/views/partials/analytics.handlebars b/views/partials/analytics.handlebars
deleted file mode 100644
index 3f7babc8..00000000
--- a/views/partials/analytics.handlebars
+++ /dev/null
@@ -1,17 +0,0 @@
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-  ga('create', '{{{trackerId}}}', 'auto');
-
-  if (window.URL && document.referrer) {
-    ga("set", "referrer", (new URL(document.referrer)).origin);
-  } else {
-    ga("set", "referrer", "");
-  }
-  
-  ga('set', 'anonymizeIp', true);
-  ga('send', 'pageview');
-</script>
\ No newline at end of file
diff --git a/views/partials/sentry.handlebars b/views/partials/sentry.handlebars
deleted file mode 100644
index 1ba12f42..00000000
--- a/views/partials/sentry.handlebars
+++ /dev/null
@@ -1,3 +0,0 @@
-<script>
-  window.dsn = '{{{dsn}}}';
-</script>
\ No newline at end of file
