diff --git a/src/lib/analytics.js b/src/lib/analytics.js
index 7699654d1ac80ed72b8be1cc00cdf05d176300ba..7b3098d6ba677e2b4efb0cc1494e474a1dc9e411 100644
--- a/src/lib/analytics.js
+++ b/src/lib/analytics.js
@@ -1,6 +1,6 @@
 import GoogleAnalytics from 'react-ga';
 
-GoogleAnalytics.initialize('UA-30688952-5', {
+GoogleAnalytics.initialize(process.env.GA_ID, {
     debug: (process.env.NODE_ENV !== 'production'),
     titleCase: true,
     sampleRate: (process.env.NODE_ENV === 'production') ? 100 : 0,
diff --git a/src/playground/index.ejs b/src/playground/index.ejs
index 3f824efb0e55b7e44cb18013dea2346bd6386062..bd88a5be2e7564977f8c18628de0058ce8a1ead0 100644
--- a/src/playground/index.ejs
+++ b/src/playground/index.ejs
@@ -5,14 +5,14 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="shortcut icon" href="static/favicon.ico">
     <title><%= htmlWebpackPlugin.options.title %></title>
-
-    <!-- Sentry error logging to help with finding bugs -->
-    <script src="https://cdn.ravenjs.com/3.22.1/raven.min.js" crossorigin="anonymous"></script>
-    <script>
-        Raven.config('https://42b7d13da8ad4d68b13e57c5e54f9a23@sentry.io/273218').install();
-    </script>
-    <!-- /Sentry -->
-
+    <% if (htmlWebpackPlugin.options.sentryConfig) { %>
+        <!-- Sentry error logging to help with finding bugs -->
+        <script src="https://cdn.ravenjs.com/3.22.1/raven.min.js" crossorigin="anonymous"></script>
+        <script>
+            Raven.config('<%= htmlWebpackPlugin.options.sentryConfig %>').install();
+        </script>
+        <!-- /Sentry -->
+    <% } %>
   </head>
   <body>
   </body>
diff --git a/webpack.config.js b/webpack.config.js
index e100c600669b0d91f80b49a4457a13dace5ca1e5..237e124da191f353423df8b5f8dd206b96fb92db 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -101,7 +101,8 @@ module.exports = [
         plugins: base.plugins.concat([
             new webpack.DefinePlugin({
                 'process.env.NODE_ENV': '"' + process.env.NODE_ENV + '"',
-                'process.env.DEBUG': Boolean(process.env.DEBUG)
+                'process.env.DEBUG': Boolean(process.env.DEBUG),
+                'process.env.GA_ID': '"' + (process.env.GA_ID || 'UA-000000-01') + '"'
             }),
             new webpack.optimize.CommonsChunkPlugin({
                 name: 'lib',
@@ -110,7 +111,8 @@ module.exports = [
             new HtmlWebpackPlugin({
                 chunks: ['lib', 'gui'],
                 template: 'src/playground/index.ejs',
-                title: 'Scratch 3.0 GUI'
+                title: 'Scratch 3.0 GUI',
+                sentryConfig: '"' + process.env.SENTRY_CONFIG + '"'
             }),
             new HtmlWebpackPlugin({
                 chunks: ['lib', 'blocksonly'],