diff --git a/ui/src/index.js b/ui/src/index.js
index e6457118fd..d576bf8528 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'
@@ -42,11 +42,18 @@ import {HEARTBEAT_INTERVAL} from 'shared/constants'
 
 const rootNode = document.getElementById('react-root')
 
+let browserHistory
 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
-})
+if (basepath) {
+  browserHistory = useRouterHistory(createHistory)({
+    basename: basepath, // this is written in when available by the URL prefixer middleware
+  })
+} else {
+  browserHistory = useRouterHistory(createHistory)({
+    basename: '',
+  })
+}
 
 const store = configureStore(loadLocalStorage(), browserHistory)
 const {dispatch} = store