diff --git a/web/ui/src/main.js b/web/ui/src/main.js
index 2284483..1c177a8 100644
--- a/web/ui/src/main.js
+++ b/web/ui/src/main.js
@@ -46,14 +46,16 @@ var restApi = new Rest('/v1/', (msg) => {
     bus.$emit('goLogin')
   }
 });
-var loadNodes = function() {
+var loadNodes = function(resolve) {
     restApi.GET('nodes').onsucceed(200, (resp) => {
         var nodes = {};
         for (var i in resp) {
             nodes[resp[i].id] = resp[i];
         }
         store.commit('setNodes', nodes);
-        resolve();
+        if(typeof resolve == "function"){
+            resolve();
+        }
     }).do();
 }
 
@@ -145,7 +147,7 @@ var initConf = new Promise((resolve) => {
     restApi.GET('configurations').onsucceed(200, (resp) => {
       Vue.use((Vue) => Vue.prototype.$appConfig = resp);
       bus.$emit('conf_loaded', resp);
-      loadNodes();
+      loadNodes(resolve);
       setInterval(loadNodes, 60*1000);
 
     }).onfailed((data, xhr) => {