diff --git a/app/views/layouts/_foot.html.erb b/app/views/layouts/_foot.html.erb
index e309c65f..ea4ab671 100644
--- a/app/views/layouts/_foot.html.erb
+++ b/app/views/layouts/_foot.html.erb
@@ -10,6 +10,6 @@
 
   Metamaps.Loading.setup()
 </script>
-<%= render :partial => 'layouts/googleanalytics' if Rails.env.production? %>
+<%= render :partial => 'layouts/googleanalytics' if ENV["GA_TRACKING_CODE"].present? %>
 </body>
 </html>
diff --git a/app/views/layouts/_googleanalytics.html.erb b/app/views/layouts/_googleanalytics.html.erb
index 11d41495..2acb9501 100644
--- a/app/views/layouts/_googleanalytics.html.erb
+++ b/app/views/layouts/_googleanalytics.html.erb
@@ -3,16 +3,13 @@
   # Google analytics, rendered on every page
   #%>
 
-<script type="text/javascript">
+<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');
 
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-35984510-1']);
-  _gaq.push(['_trackPageview']);
-
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl.' : 'http://') +  'stats.g.doubleclick.net/dc.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
+  ga('create', '<%= ENV["GA_TRACKING_CODE"] %>', 'auto');
+  ga('send', 'pageview');
 
 </script>