diff --git a/common/store.ts b/common/store.ts
index b831e3c9..718c71c9 100644
--- a/common/store.ts
+++ b/common/store.ts
@@ -1,5 +1,4 @@
 import throttle from 'lodash/throttle';
-import Perf from 'react-addons-perf';
 import { routerMiddleware } from 'react-router-redux';
 import { INITIAL_STATE as configInitialState } from 'reducers/config';
 import { INITIAL_STATE as customTokensInitialState } from 'reducers/customTokens';
@@ -16,9 +15,6 @@ import promiseMiddleware from 'redux-promise-middleware';
 
 import sagas from './sagas';
 
-interface MyWindow extends Window {
-  Perf: Perf;
-}
 const configureStore = () => {
   const logger = createLogger({
     collapsed: true
@@ -31,7 +27,6 @@ const configureStore = () => {
   let store;
 
   if (process.env.NODE_ENV !== 'production') {
-    (window as MyWindow).Perf = Perf;
     middleware = composeWithDevTools(
       applyMiddleware(
         sagaMiddleware,
diff --git a/package-lock.json b/package-lock.json
index 07dc7512..5465a52e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10552,15 +10552,45 @@
       }
     },
     "react": {
-      "version": "15.6.1",
-      "resolved": "https://registry.npmjs.org/react/-/react-15.6.1.tgz",
-      "integrity": "sha1-uqhDTsZ4C96ZfNw4C3nNM7ljk98=",
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/react/-/react-16.0.0.tgz",
+      "integrity": "sha1-zn348ZQbA28Cssyp29DLHw6FXi0=",
       "requires": {
-        "create-react-class": "15.6.0",
-        "fbjs": "0.8.12",
+        "fbjs": "0.8.16",
         "loose-envify": "1.3.1",
         "object-assign": "4.1.1",
-        "prop-types": "15.5.10"
+        "prop-types": "15.6.0"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "1.2.7",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
+          "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
+        },
+        "fbjs": {
+          "version": "0.8.16",
+          "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.16.tgz",
+          "integrity": "sha1-XmdDL1UNxBtXK/VYR7ispk5TN9s=",
+          "requires": {
+            "core-js": "1.2.7",
+            "isomorphic-fetch": "2.2.1",
+            "loose-envify": "1.3.1",
+            "object-assign": "4.1.1",
+            "promise": "7.3.1",
+            "setimmediate": "1.0.5",
+            "ua-parser-js": "0.7.13"
+          }
+        },
+        "prop-types": {
+          "version": "15.6.0",
+          "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz",
+          "integrity": "sha1-zq8IMCL8RrSjX2nhPvda7Q1jmFY=",
+          "requires": {
+            "fbjs": "0.8.16",
+            "loose-envify": "1.3.1",
+            "object-assign": "4.1.1"
+          }
+        }
       }
     },
     "react-addons-perf": {
@@ -10580,14 +10610,45 @@
       "dev": true
     },
     "react-dom": {
-      "version": "15.6.1",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.6.1.tgz",
-      "integrity": "sha1-LLDtQZEDjlPCCes6eaI+Kkz5lHA=",
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.0.0.tgz",
+      "integrity": "sha1-nMMHnD3NcNTG4BuEqrKn40wwP1g=",
       "requires": {
-        "fbjs": "0.8.12",
+        "fbjs": "0.8.16",
         "loose-envify": "1.3.1",
         "object-assign": "4.1.1",
-        "prop-types": "15.5.10"
+        "prop-types": "15.6.0"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "1.2.7",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
+          "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
+        },
+        "fbjs": {
+          "version": "0.8.16",
+          "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.16.tgz",
+          "integrity": "sha1-XmdDL1UNxBtXK/VYR7ispk5TN9s=",
+          "requires": {
+            "core-js": "1.2.7",
+            "isomorphic-fetch": "2.2.1",
+            "loose-envify": "1.3.1",
+            "object-assign": "4.1.1",
+            "promise": "7.3.1",
+            "setimmediate": "1.0.5",
+            "ua-parser-js": "0.7.13"
+          }
+        },
+        "prop-types": {
+          "version": "15.6.0",
+          "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz",
+          "integrity": "sha1-zq8IMCL8RrSjX2nhPvda7Q1jmFY=",
+          "requires": {
+            "fbjs": "0.8.16",
+            "loose-envify": "1.3.1",
+            "object-assign": "4.1.1"
+          }
+        }
       }
     },
     "react-hot-loader": {
diff --git a/package.json b/package.json
index fe55a76e..de27612c 100644
--- a/package.json
+++ b/package.json
@@ -24,8 +24,8 @@
     "moment": "^2.18.1",
     "qrcode": "^0.8.2",
     "qrcode.react": "^0.7.1",
-    "react": "^15.4.2",
-    "react-dom": "^15.4.2",
+    "react": "16.0.0",
+    "react-dom": "16.0.0",
     "react-markdown": "^2.5.0",
     "react-redux": "^5.0.6",
     "react-router": "^3.0.0",
@@ -87,7 +87,6 @@
     "null-loader": "^0.1.1",
     "prettier": "^1.7.0",
     "progress": "^2.0.0",
-    "react-addons-perf": "^15.4.2",
     "react-hot-loader": "^3.0.0-beta.6",
     "redux-devtools-extension": "^2.13.0",
     "resolve-url-loader": "^2.0.0",