diff --git a/src/client/epics/index.js b/src/client/epics/index.js
index c4770b27bea7c918db337f78d3120c33cd78379c..1baf49ce92722c7c79c5e99fb553ab672dba7120 100644
--- a/src/client/epics/index.js
+++ b/src/client/epics/index.js
@@ -14,8 +14,8 @@ import {
 } from '../actions';
 
 const apiUrl = (process.env.NODE_ENV === 'development')
-  ? 'http://localhost:3001'
-  : location.href;
+  ? 'http://localhost:3001/api/'
+  : `${location.href}/api/`;
 
 const getManuscripts = (action$, state$) => action$.pipe(
   ofType(FETCH_MANUSCRIPTS),
@@ -33,7 +33,7 @@ const getManuscripts = (action$, state$) => action$.pipe(
     if (activeFilters) {
       params.filters = JSON.stringify(filters);
     }
-    const searchUrl = apiUrl + '/manuscripts';
+    const searchUrl = apiUrl + 'manuscripts';
     const requestUrl = `${searchUrl}?${stringify(params)}`;
     return ajax.getJSON(requestUrl).pipe(
       map(data => updateManuscripts({ data }))
@@ -44,7 +44,7 @@ const getManuscripts = (action$, state$) => action$.pipe(
 const getPlaces = action$ => action$.pipe(
   ofType(FETCH_PLACES),
   mergeMap(action => {
-    const searchUrl = apiUrl + '/places';
+    const searchUrl = apiUrl + 'places';
     const requestUrl = `${searchUrl}?variant=${action.variant}`;
     return ajax.getJSON(requestUrl).pipe(
       map(response => updatePlaces({ places: response }))
@@ -55,7 +55,7 @@ const getPlaces = action$ => action$.pipe(
 const getPlace = action$ => action$.pipe(
   ofType(FETCH_PLACE),
   mergeMap(action => {
-    const searchUrl = apiUrl + '/places';
+    const searchUrl = apiUrl + 'places';
     const requestUrl = `${searchUrl}/${encodeURIComponent(action.placeId)}`;
     return ajax.getJSON(requestUrl).pipe(
       map(response => updatePlace({ place: response }))
@@ -79,7 +79,7 @@ const getFacet = (action$, state$) => action$.pipe(
     if (activeFilters) {
       params.filters = JSON.stringify(filters);
     }
-    const searchUrl = apiUrl + '/facets';
+    const searchUrl = apiUrl + 'facets';
     const requestUrl = `${searchUrl}?${stringify(params)}`;
     return ajax.getJSON(requestUrl).pipe(
       map(response => updateFacet({ facetValues: response }))
diff --git a/src/server/index.js b/src/server/index.js
index 0c34f3b30d3b672ce91e36e07a2f4ce07c1acac3..0af9cbd4caf8bc362be91d783ffb6be681557134 100644
--- a/src/server/index.js
+++ b/src/server/index.js
@@ -1,7 +1,6 @@
 import express from 'express';
 const path = require('path');
 import bodyParser from 'body-parser';
-
 import {
   getManuscripts,
   getPlaces,
@@ -10,6 +9,7 @@ import {
 } from './sparql/Manuscripts';
 const DEFAULT_PORT = 3001;
 const app = express();
+const apiPath = '/api';
 
 app.set('port', process.env.PORT || DEFAULT_PORT);
 app.use(bodyParser.json());
@@ -24,7 +24,7 @@ app.use(function(req, res, next) {
 // Serve the static files from the React app
 app.use(express.static(path.join(__dirname, './../public/')));
 
-app.get('/manuscripts', (req, res) => {
+app.get(`${apiPath}/manuscripts`, (req, res) => {
   const page = parseInt(req.query.page) || 0;
   const filters = req.query.filters == null ? null : JSON.parse(req.query.filters);
   const pagesize = 5;
@@ -39,7 +39,7 @@ app.get('/manuscripts', (req, res) => {
     });
 });
 
-app.get('/places/:placeId?', (req, res) => {
+app.get(`${apiPath}/places/:placeId?`, (req, res) => {
   if (req.params.placeId) {
     return getPlace(req.params.placeId).then(data => {
       res.json(data[0]);
@@ -61,7 +61,7 @@ app.get('/places/:placeId?', (req, res) => {
   }
 });
 
-app.get('/facets', (req, res) => {
+app.get(`${apiPath}/facets`, (req, res) => {
   const filters = req.query.filters == null ? null : JSON.parse(req.query.filters);
   // console.log(filters)
   return getFacets(filters).then((data) => {