diff --git a/config/webpack.config.dev.js b/config/webpack.config.dev.js
index a708f18..8d07295 100644
--- a/config/webpack.config.dev.js
+++ b/config/webpack.config.dev.js
@@ -339,7 +339,8 @@ module.exports = {
   },
   plugins: [
     new webpack.DefinePlugin({
-      'process.env': {
+      'process.localEnv': {
+        'NODE_ENV': JSON.stringify('local'),
         'GIT_HASH': JSON.stringify(gitHash),
         'OAUTH_TOKEN': JSON.stringify(localEnv.OAUTH_TOKEN)
       }
diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js
index db25724..e4c5fcb 100644
--- a/config/webpack.config.prod.js
+++ b/config/webpack.config.prod.js
@@ -424,7 +424,8 @@ module.exports = {
   },
   plugins: [
     new webpack.DefinePlugin({
-      'process.env': {
+      'process.localEnv': {
+        'NODE_ENV': JSON.stringify('production'),
         'GIT_HASH': JSON.stringify(gitHash)
       }
     }),
diff --git a/src/pages/Home/Scene.js b/src/pages/Home/Scene.js
index a7eda5d..c92d4b4 100644
--- a/src/pages/Home/Scene.js
+++ b/src/pages/Home/Scene.js
@@ -28,7 +28,7 @@ import FacebookLogo from '../../images/logos/facebook-logo.png';
 import '../../styles/gradient.css';
 import '../../styles/font.css';
 
-const hash = process.env.GIT_HASH ? `#${process.env.GIT_HASH}` : '';
+const hash = process.localEnv.GIT_HASH ? `#${process.localEnv.GIT_HASH}` : '';
 const version = require('../../../package.json').version + hash;
 
 const themeColor = '#457cff';
diff --git a/src/pages/NotificationsRedesign/index.js b/src/pages/NotificationsRedesign/index.js
index b69b93b..b329c60 100644
--- a/src/pages/NotificationsRedesign/index.js
+++ b/src/pages/NotificationsRedesign/index.js
@@ -193,7 +193,7 @@ class NotificationsPage extends React.Component {
       amplitude.getInstance().setUserProperties({
         username: user.login,
         full_name: user.name,
-        version: process.env.GIT_HASH ? process.env.GIT_HASH : 'unknown'
+        version: process.localEnv.GIT_HASH ? process.localEnv.GIT_HASH : 'unknown'
       });
       this.setState({user});
     });
diff --git a/src/pages/NotificationsRedesign/redesign/Scene.js b/src/pages/NotificationsRedesign/redesign/Scene.js
index 00d829e..4f7245a 100644
--- a/src/pages/NotificationsRedesign/redesign/Scene.js
+++ b/src/pages/NotificationsRedesign/redesign/Scene.js
@@ -78,7 +78,7 @@ import {
 } from './ui';
 export const AnimatedNotificationRow = animated(NotificationRow);
 
-const hash = process.env.GIT_HASH ? `#${process.env.GIT_HASH}` : '';
+const hash = process.localEnv.GIT_HASH ? `#${process.localEnv.GIT_HASH}` : '';
 const version = require('../../../../package.json').version + hash;
 
 function PageItem ({children, onChange, ...props}) {
diff --git a/src/pages/common/index.js b/src/pages/common/index.js
index d73f0a7..58e3759 100644
--- a/src/pages/common/index.js
+++ b/src/pages/common/index.js
@@ -12,7 +12,7 @@ import '../../styles/font.css';
 
 const themeColor = '#27B768';
 
-const hash = process.env.GIT_HASH ? `#${process.env.GIT_HASH}` : '';
+const hash = process.localEnv.GIT_HASH ? `#${process.localEnv.GIT_HASH}` : '';
 const version = require('../../../package.json').version + hash;
 
 export const forSmallScreens = rules => `
diff --git a/src/providers/Auth.js b/src/providers/Auth.js
index daf9f03..edcd105 100644
--- a/src/providers/Auth.js
+++ b/src/providers/Auth.js
@@ -6,7 +6,12 @@ const {Provider, Consumer} = React.createContext();
 
 class AuthProvider extends React.Component {
   state = {
-    token: this.props.cookiesApi.getCookie(OAUTH_TOKEN_COOKIE) || process.env.OAUTH_TOKEN
+    token: (
+      this.props.cookiesApi.getCookie(OAUTH_TOKEN_COOKIE) ||
+      (process.localEnv.NODE_ENV === 'local'
+        ? process.localEnv.OAUTH_TOKEN
+        : undefined)
+    )
   }
 
   setToken = token => {