diff --git a/node/db/API.js b/node/db/API.js
index b9b785b0d..7a3dc952c 100644
--- a/node/db/API.js
+++ b/node/db/API.js
@@ -480,7 +480,7 @@ exports.listAllPads = function(callback)
     //get all groups
     groupManager.listGroups(function (err, groups)
     {
-        groups=groups["groups"];
+        groups=groups["groupIDs"];
         // if defaultGroup exists add this too, becaus ists not listed in groupManager.listGroups
         groupManager.doesGroupExist(defaultGroup, function(err, exists)
         {
diff --git a/node/db/GroupManager.js b/node/db/GroupManager.js
index 8e3931cd7..4a7aa9648 100644
--- a/node/db/GroupManager.js
+++ b/node/db/GroupManager.js
@@ -143,9 +143,9 @@ exports.listGroups = function(callback)
   //try to get the groups entry
   db.get("groups", function (err, groups)
   {
-    if(groups == null) groups = [];
+    if(groups == null) groups["groups"] = [];
     if(ERR(err, callback)) return;
-    callback(null, groups);
+    callback(null, {groupIDs: groups["groups"]});
   });
 }