diff --git a/src/main/java/io/bitsquare/gui/main/MainModel.java b/src/main/java/io/bitsquare/gui/main/MainModel.java
index b0be246be0..2291611195 100644
--- a/src/main/java/io/bitsquare/gui/main/MainModel.java
+++ b/src/main/java/io/bitsquare/gui/main/MainModel.java
@@ -23,7 +23,6 @@ import io.bitsquare.gui.UIModel;
 import io.bitsquare.gui.util.Profiler;
 import io.bitsquare.msg.DHTSeedService;
 import io.bitsquare.msg.MessageFacade;
-import io.bitsquare.msg.actor.event.PeerInitialized;
 import io.bitsquare.msg.listeners.BootstrapListener;
 import io.bitsquare.persistence.Persistence;
 import io.bitsquare.trade.Trade;
@@ -103,7 +102,10 @@ class MainModel extends UIModel {
 
     void initBackend() {
 
-        dhtSeedService.setHandler(m -> {
+        // For testing with the serverside seednode we need the BootstrappedPeerFactory which gets started form 
+        // messageFacade.init
+        
+        /*dhtSeedService.setHandler(m -> {
             if (m instanceof PeerInitialized) {
                 log.debug("dht seed initialized. ");
                 // init messageFacade after seed node initialized
@@ -122,7 +124,20 @@ class MainModel extends UIModel {
             }
         });
 
-        dhtSeedService.initializePeer();
+        dhtSeedService.initializePeer();*/
+
+        messageFacade.init(new BootstrapListener() {
+            @Override
+            public void onCompleted() {
+                messageFacadeInited = true;
+                if (walletFacadeInited) onFacadesInitialised();
+            }
+
+            @Override
+            public void onFailed(Throwable throwable) {
+                log.error(throwable.toString());
+            }
+        });
 
         Profiler.printMsgWithTime("MainModel.initFacades");