diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7620adff71..982198dda0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## v1.3.0~rc2 [unreleased]
+
+### Bug Fixes
+  1. [#1433](https://github.com/influxdata/chronograf/pull/1433): Fix router bug introduced by upgrading to react-router v3.0.
+
 ## v1.3.0~rc1 [2017-05-08]
 
 ### Bug Fixes
diff --git a/ui/src/index.js b/ui/src/index.js
index fe404c7036..de18a73385 100644
--- a/ui/src/index.js
+++ b/ui/src/index.js
@@ -1,8 +1,8 @@
 import React from 'react'
 import {render} from 'react-dom'
 import {Provider} from 'react-redux'
-import {Router, Route} from 'react-router'
-import {createHistory, useBasename} from 'history'
+import {Router, Route, useRouterHistory} from 'react-router'
+import {createHistory} from 'history'
 import {syncHistoryWithStore} from 'react-router-redux'
 
 import App from 'src/App'
@@ -44,8 +44,8 @@ const rootNode = document.getElementById('react-root')
 
 const basepath = rootNode.dataset.basepath || ''
 window.basepath = basepath
-const browserHistory = useBasename(createHistory)({
-  basename: basepath, // basepath is written in when available by the URL prefixer middleware
+const browserHistory = useRouterHistory(createHistory)({
+  basename: basepath, // this is written in when available by the URL prefixer middleware
 })
 
 const store = configureStore(loadLocalStorage(), browserHistory)