diff --git a/packages/client/src/middleware/index.ts b/packages/client/src/middleware/index.ts
index d144926..6f78576 100644
--- a/packages/client/src/middleware/index.ts
+++ b/packages/client/src/middleware/index.ts
@@ -1,2 +1,3 @@
 export * from './PromiseMiddleware'
 export * from './ReduxLogger'
+export * from './WaitMiddleware'
diff --git a/packages/client/src/renderer/ClientRenderer.tsx b/packages/client/src/renderer/ClientRenderer.tsx
index 0847050..2d219e4 100644
--- a/packages/client/src/renderer/ClientRenderer.tsx
+++ b/packages/client/src/renderer/ClientRenderer.tsx
@@ -35,7 +35,7 @@ export class ClientRenderer<State, A extends Action, D extends IAPIDef>
       target = document.getElementById('container'),
     } = this.params
 
-    const http = new HTTPClient<D>(config.baseUrl)
+    const http = new HTTPClient<D>(config.baseUrl + '/api')
 
     const history = createBrowserHistory({
       basename: config.baseUrl,
diff --git a/packages/client/src/renderer/ServerRenderer.tsx b/packages/client/src/renderer/ServerRenderer.tsx
index bd19181..d7fb3b6 100644
--- a/packages/client/src/renderer/ServerRenderer.tsx
+++ b/packages/client/src/renderer/ServerRenderer.tsx
@@ -23,10 +23,11 @@ export class ServerRenderer<State, A extends Action, D extends IAPIDef>
     url: string,
     config: IClientConfig,
     state?: any,
+    host: string = '',
   ) {
     const {RootComponent} = this
     const store = this.createStore(state)
-    const http = new HTTPClient<D>(config.baseUrl)
+    const http = new HTTPClient<D>(host + config.baseUrl + '/api')
 
     const context: StaticRouterContext = {}
     const stream = renderToNodeStream(
diff --git a/packages/client/src/store/createStore.ts b/packages/client/src/store/createStore.ts
index 7286cae..dc56c09 100644
--- a/packages/client/src/store/createStore.ts
+++ b/packages/client/src/store/createStore.ts
@@ -1,4 +1,4 @@
-import {ReduxLogger, PromiseMiddleware} from '../middleware'
+import {ReduxLogger, PromiseMiddleware, WaitMiddleware} from '../middleware'
 import {
   applyMiddleware,
   createStore as create,
@@ -27,6 +27,7 @@ export function createStore<State, A extends Action>(
       && typeof window.localStorage.log !== 'undefined',
     ).handle,
     new PromiseMiddleware().handle,
+    new WaitMiddleware().handle,
   ]
   return (state?: DeepPartial<State>) => create(
     params.reducer,