diff --git a/app/js/config.js b/app/js/config.js
index 7ce9dc2..b84cc24 100644
--- a/app/js/config.js
+++ b/app/js/config.js
@@ -1,4 +1,4 @@
 export default {
     'ENSDappURL': 'http://www.status.im/',
-    'APIServer': 'http://localhost:3000'
+    'APIServer': 'http://localhost:3000/api'
 };
diff --git a/config/blockchain.js b/config/blockchain.js
index 4b929d1..a9b54dc 100644
--- a/config/blockchain.js
+++ b/config/blockchain.js
@@ -73,6 +73,7 @@ module.exports = {
   testnet: {
     networkType: "testnet",
     syncMode: "light",
+    wsOrigins: "http://localhost:8000,embark",
     account: {
       password: "config/testnet/password"
     }
diff --git a/config/communication.js b/config/communication.js
index 641c0cd..ce42a42 100644
--- a/config/communication.js
+++ b/config/communication.js
@@ -1,7 +1,7 @@
 module.exports = {
   // default applies to all environments
   default: {
-    enabled: true,
+    enabled: false,
     provider: "whisper", // Communication provider. Currently, Embark only supports whisper
     available_providers: ["whisper"], // Array of available providers
   },
diff --git a/config/storage.js b/config/storage.js
index de123e3..5f32dfd 100644
--- a/config/storage.js
+++ b/config/storage.js
@@ -1,7 +1,7 @@
 module.exports = {
   // default applies to all environments
   default: {
-    enabled: true,
+    enabled: false,
     ipfs_bin: "ipfs",
     provider: "ipfs",
     available_providers: ["ipfs"],
diff --git a/server/main.js b/server/main.js
index ce9a82d..976e5b0 100644
--- a/server/main.js
+++ b/server/main.js
@@ -177,7 +177,7 @@ events.on('web3:connected', () => {
 
     app.use(bodyParser.urlencoded({extended: false}));
     app.use(bodyParser.json());
-    app.use('/', router);
+    app.use('/api/', router);
 
     app.listen(port, () => {
         console.log('Server listening on port ' + port);