diff --git a/browser/main/Main.js b/browser/main/Main.js
index abada90d..369a58da 100644
--- a/browser/main/Main.js
+++ b/browser/main/Main.js
@@ -22,7 +22,9 @@ class Main extends React.Component {
   constructor (props) {
     super(props)
 
-    mobileAnalytics.initAwsMobileAnalytics()
+    if (process.env.NODE_ENV === 'production') {
+      mobileAnalytics.initAwsMobileAnalytics()
+    }
 
     let { config } = props
 
diff --git a/browser/main/lib/AwsMobileAnalyticsConfig.js b/browser/main/lib/AwsMobileAnalyticsConfig.js
index 671a8faf..dcf05a16 100644
--- a/browser/main/lib/AwsMobileAnalyticsConfig.js
+++ b/browser/main/lib/AwsMobileAnalyticsConfig.js
@@ -2,17 +2,18 @@ const AWS = require('aws-sdk')
 const AMA = require('aws-sdk-mobile-analytics')
 const ConfigManager = require('browser/main/lib/ConfigManager')
 
-AWS.config.region = 'us-east-1'
-AWS.config.credentials = new AWS.CognitoIdentityCredentials({
-  IdentityPoolId: 'us-east-1:xxxxxxxxxxxxxxxxxxxxxxxxx'
-})
 const mobileAnalyticsClient = new AMA.Manager({
   appId: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
   appTitle: 'xxxxxxxxxx'
 })
 
 function initAwsMobileAnalytics () {
-  AWS.config.credentials.get(function (err) {
+  AWS.config.region = 'us-east-1'
+  AWS.config.credentials = new AWS.CognitoIdentityCredentials({
+    IdentityPoolId: 'us-east-1:xxxxxxxxxxxxxxxxxxxxxxxxx'
+  })
+
+  AWS.config.credentials.get((err) => {
     if (!err) {
       console.log('Cognito Identity ID: ' + AWS.config.credentials.identityId)
     }