diff --git a/client/store/libraries.js b/client/store/libraries.js
index d795e57f..3b06df50 100644
--- a/client/store/libraries.js
+++ b/client/store/libraries.js
@@ -86,8 +86,8 @@ export const actions = {
       .$get('/api/filesystem')
       .then((res) => {
         console.log('Settings folders', res)
-        commit('setFolders', res)
-        return res
+        commit('setFolders', res.directories)
+        return res.directories
       })
       .catch((error) => {
         console.error('Failed to load dirs', error)
@@ -151,7 +151,7 @@ export const actions = {
     this.$axios
       .$get(`/api/libraries`)
       .then((data) => {
-        commit('set', data)
+        commit('set', data.libraries)
         commit('setLastLoad')
       })
       .catch((error) => {
diff --git a/server/controllers/LibraryController.js b/server/controllers/LibraryController.js
index e138d177..a6667a96 100644
--- a/server/controllers/LibraryController.js
+++ b/server/controllers/LibraryController.js
@@ -467,9 +467,7 @@ class LibraryController {
     const limitPerShelf = req.query.limit && !isNaN(req.query.limit) ? Number(req.query.limit) : 10
 
     const categories = libraryHelpers.buildPersonalizedShelves(req.user, libraryItems, mediaType, this.db.series, this.db.authors, limitPerShelf)
-    res.json({
-      shelves: categories
-    })
+    res.json(categories)
   }
 
   // PATCH: Change the order of libraries