diff --git a/client/coral-admin/src/AppRouter.js b/client/coral-admin/src/AppRouter.js
index 99eea97ae..5827f0a21 100644
--- a/client/coral-admin/src/AppRouter.js
+++ b/client/coral-admin/src/AppRouter.js
@@ -1,6 +1,6 @@
 import React from 'react';
-import {Router, Route, IndexRedirect, browserHistory, Redirect} from 'react-router';
-import {useBasename} from 'history';
+import {Router, Route, IndexRedirect, Redirect} from 'react-router';
+import {history} from 'coral-framework/helpers/router';
 
 import Configure from 'routes/Configure';
 import Dashboard from 'routes/Dashboard';
@@ -57,8 +57,6 @@ const routes = (
   </div>
 );
 
-const AppRouter = () => <Router history={useBasename(() => browserHistory)({
-  basename: '/talk/'
-})} routes={routes}/>;
+const AppRouter = () => <Router history={history} routes={routes}/>;
 
 export default AppRouter;
diff --git a/client/coral-embed-stream/src/AppRouter.js b/client/coral-embed-stream/src/AppRouter.js
index 6ee63caab..c2e7b2c5d 100644
--- a/client/coral-embed-stream/src/AppRouter.js
+++ b/client/coral-embed-stream/src/AppRouter.js
@@ -1,5 +1,6 @@
 import React from 'react';
-import {Router, Route, browserHistory} from 'react-router';
+import {Router, Route} from 'react-router';
+import {history} from 'coral-framework/helpers/router';
 
 import Embed from './containers/Embed';
 import {LoginContainer} from 'coral-sign-in/containers/LoginContainer';
@@ -11,6 +12,6 @@ const routes = (
   </div>
 );
 
-const AppRouter = () => <Router history={browserHistory} routes={routes} />;
+const AppRouter = () => <Router history={history} routes={routes} />;
 
 export default AppRouter;
diff --git a/client/coral-embed-stream/src/components/Embed.js b/client/coral-embed-stream/src/components/Embed.js
index a069984dc..f918b7a16 100644
--- a/client/coral-embed-stream/src/components/Embed.js
+++ b/client/coral-embed-stream/src/components/Embed.js
@@ -36,7 +36,7 @@ export default class Embed extends React.Component {
       <div className={cn('talk-embed-stream', {'talk-embed-stream-highlight-comment': hasHighlightedComment})}>
         <IfSlotIsNotEmpty slot="login">
           <Popup
-            href='/embed/stream/login'
+            href='embed/stream/login'
             title='Login'
             features='menubar=0,resizable=0,width=500,height=550,top=200,left=500'
             open={showSignInDialog}
diff --git a/client/coral-framework/helpers/router.js b/client/coral-framework/helpers/router.js
new file mode 100644
index 000000000..e6277e9d8
--- /dev/null
+++ b/client/coral-framework/helpers/router.js
@@ -0,0 +1,7 @@
+import {useBasename} from 'history';
+import {browserHistory} from 'react-router';
+import {BASE_PATH} from 'coral-framework/constants/url';
+
+export const history = useBasename(() => browserHistory)({
+  basename: BASE_PATH
+});