diff --git a/src/client/epics/index.js b/src/client/epics/index.js
index 7d35e8630ba14c3b5a3eaeb7341f536c48ebfeda..281158efb9350baa8d9396598bf31ba8f78de590 100644
--- a/src/client/epics/index.js
+++ b/src/client/epics/index.js
@@ -15,7 +15,7 @@ import {
   GET_GEOJSON_FAILED
 } from '../actions';
 
-const hiplaApiUrl = 'http://localhost:3000/api/';
+const hiplaApiUrl = 'http://localhost:3001/';
 
 const getSuggestionsEpic = (action$, store) => {
   const searchUrl = hiplaApiUrl + 'suggest';
diff --git a/src/server/index.js b/src/server/index.js
index af3cd03e831a5131aa2466ca00220009c9ccb77d..ea7ae913deccd7bb9363bb2ad7cf50a669573716 100644
--- a/src/server/index.js
+++ b/src/server/index.js
@@ -17,7 +17,7 @@ app.use(function(req, res, next) {
   next();
 });
 
-app.get('/api/suggest', (req, res) => {
+app.get('/suggest', (req, res) => {
   // https://softwareengineering.stackexchange.com/questions/233164/how-do-searches-fit-into-a-restful-interface
   // example request: http://localhost:3000/search?dataset=warsa_karelian_places&dataset=pnr&q=viip
   const queryDatasets = _.castArray(req.query.dataset);
@@ -34,7 +34,7 @@ app.get('/api/suggest', (req, res) => {
     });
 });
 
-app.get('/api/search', (req, res) => {
+app.get('/search', (req, res) => {
   // https://softwareengineering.stackexchange.com/questions/233164/how-do-searches-fit-into-a-restful-interface
   // example request: http://localhost:3000/search?dataset=warsa_karelian_places&dataset=pnr&q=viip
   const queryDatasets = _.castArray(req.query.dataset);
@@ -51,7 +51,7 @@ app.get('/api/search', (req, res) => {
     });
 });
 
-app.get('/api/wfs', (req, res) => {
+app.get('/wfs', (req, res) => {
   //
   // Taustakartan rajat:
   //
diff --git a/webpack.client.dev.js b/webpack.client.dev.js
index 422956d579cacb49e393f4fae81472cd35dd115e..e55f581ee59e7a495357c6f4146d7d9b4596ea06 100644
--- a/webpack.client.dev.js
+++ b/webpack.client.dev.js
@@ -9,8 +9,8 @@ module.exports = merge(common, {
     hot: true,
     port: 8080,
     open: true,
-    proxy: {
-      '/api': 'http://localhost:3000'
-    }
+    // proxy: {
+    //   '/api': 'http://localhost:3000'
+    // }
   }
 });