diff --git a/client/index.js b/client/index.js
index f09d2cbbe9..dd375a9c92 100644
--- a/client/index.js
+++ b/client/index.js
@@ -1,4 +1,3 @@
-/* global __OPBEAT__ORG_ID __OPBEAT__APP_ID */
 import initOpbeat from 'opbeat-react';
 import { createOpbeatMiddleware } from 'opbeat-react/redux';
 import Rx from 'rx';
@@ -20,8 +19,13 @@ import {
   saveToColdStorage
 } from './cold-reload';
 
-const localhostRE = /^(localhost|127.|0.)/;
-const enableOpbeat = !localhostRE.test(window.location.hostname);
+const {
+  __OPBEAT__ORG_ID,
+  __OPBEAT__APP_ID,
+  NODE_ENV
+} = process.env;
+
+const enableOpbeat = NODE_ENV !== 'development';
 
 if (enableOpbeat) {
   if (!__OPBEAT__ORG_ID || !__OPBEAT__APP_ID) {
diff --git a/webpack.config.js b/webpack.config.js
index d66c49ef5d..fe134849ba 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -53,11 +53,11 @@ module.exports = {
   plugins: [
     new webpack.DefinePlugin({
       'process.env': {
-        NODE_ENV: JSON.stringify(__DEV__ ? 'development' : 'production')
+        NODE_ENV: JSON.stringify(__DEV__ ? 'development' : 'production'),
+        __OPBEAT__ORG_ID: JSON.stringify(process.env.OPBEAT_FRONTEND_ORG_ID),
+        __OPBEAT__APP_ID: JSON.stringify(process.env.OPBEAT_FRONTEND_APP_ID)
       },
-      __DEVTOOLS__: !__DEV__,
-      __OPBEAT__ORG_ID: JSON.stringify(process.env.OPBEAT_FRONTEND_ORG_ID),
-      __OPBEAT__APP_ID: JSON.stringify(process.env.OPBEAT_FRONTEND_APP_ID)
+      __DEVTOOLS__: !__DEV__
     }),
     // Use browser version of visionmedia-debug
     new webpack.NormalModuleReplacementPlugin(