diff --git a/app/adapters/application.js b/app/adapters/application.js
index fa01ec20b3653103685c90f10a5d0732fff12762..962b6b7e60771c9b8c7910a3faa7fce42b31e286 100644
--- a/app/adapters/application.js
+++ b/app/adapters/application.js
@@ -2,6 +2,7 @@ import JSONAPIAdapter from '@ember-data/adapter/json-api';
 import { computed } from '@ember/object';
 import { inject as service } from '@ember/service';
 
+
 export default class ApplicationAdapter extends JSONAPIAdapter {
   namespace = 'api';
   host = 'http://127.0.0.1:8000';
@@ -19,7 +20,7 @@ export default class ApplicationAdapter extends JSONAPIAdapter {
     // or a Document
     if (modelName == 'folder') {
       return 'nodes';
-    } else if (modeName == 'document') {
+    } else if (modelName == 'document') {
       return 'nodes';
     }
 
diff --git a/app/routes/authenticated/index.js b/app/routes/authenticated/index.js
index 0ddce9e16122337f389a2735e4a778e3e881b83c..69ee43ea93b5635d3b7557d240c14a085bb264a6 100644
--- a/app/routes/authenticated/index.js
+++ b/app/routes/authenticated/index.js
@@ -1,6 +1,7 @@
 import { inject as service } from '@ember/service';
 import BaseRoute from 'papermerge/base/routing';
 
+
 export default class IndexRoute extends BaseRoute {
   @service store;
   @service currentUser;
@@ -13,27 +14,11 @@ export default class IndexRoute extends BaseRoute {
     if (!params.node_id) {
       // when node_id is not provided, use as default
       // user's home folder ID.
-      return adapter.findNode(this.home_folder_id);
+      return this.currentUser.user.home_folder.then((home_folder) => {
+        return adapter.findNode(home_folder.id);
+      });
     }
 
     return adapter.findNode(params.node_id);
   }
-
-  get home_folder_id() {
-    /*
-    Another way to get home folder would be:
-
-      this.currentUser.user.get('home_folder').get('id')
-
-    However, last call will issue following background http API call:
-
-      GET /api/folders/<folder_id>/.
-
-    The workaround/the trick to avoid this background call, is to
-    convert user to json object, and then just get `home_folder` attribute
-    which is just an id.
-    */
-    let user_json = this.currentUser.user.toJSON();
-    return user_json['home_folder'];
-  }
 }