diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c
index c02558db73d295d88adbbbd822e4929c63dab454..e9a36b2585e6bfb0073b6ed49876ec351524f486 100644
--- a/src/conf/virsecretobj.c
+++ b/src/conf/virsecretobj.c
@@ -433,7 +433,36 @@ virSecretObjListAdd(virSecretObjListPtr secrets,
 }
 
 
-struct virSecretObjListGetHelperData {
+struct virSecretCountData {
+    virConnectPtr conn;
+    virSecretObjListACLFilter aclfilter;
+    int count;
+};
+
+static int
+virSecretObjListNumOfSecretsCallback(void *payload,
+                                     const void *name ATTRIBUTE_UNUSED,
+                                     void *opaque)
+{
+    struct virSecretCountData *data = opaque;
+    virSecretObjPtr obj = payload;
+    virSecretDefPtr def;
+
+    virObjectLock(obj);
+    def = obj->def;
+
+    if (data->aclfilter && !data->aclfilter(data->conn, def))
+        goto cleanup;
+
+    data->count++;
+
+ cleanup:
+    virObjectUnlock(obj);
+    return 0;
+}
+
+
+struct virSecretListData {
     virConnectPtr conn;
     virSecretObjListACLFilter aclfilter;
     int nuuids;
@@ -444,11 +473,11 @@ struct virSecretObjListGetHelperData {
 
 
 static int
-virSecretObjListGetHelper(void *payload,
-                          const void *name ATTRIBUTE_UNUSED,
-                          void *opaque)
+virSecretObjListGetUUIDsCallback(void *payload,
+                                 const void *name ATTRIBUTE_UNUSED,
+                                 void *opaque)
 {
-    struct virSecretObjListGetHelperData *data = opaque;
+    struct virSecretListData *data = opaque;
     virSecretObjPtr obj = payload;
     virSecretDefPtr def;
 
@@ -473,11 +502,9 @@ virSecretObjListGetHelper(void *payload,
         }
 
         virUUIDFormat(def->uuid, uuidstr);
-        data->uuids[data->nuuids] = uuidstr;
+        data->uuids[data->nuuids++] = uuidstr;
     }
 
-    data->nuuids++;
-
  cleanup:
     virObjectUnlock(obj);
     return 0;
@@ -489,15 +516,14 @@ virSecretObjListNumOfSecrets(virSecretObjListPtr secrets,
                              virSecretObjListACLFilter aclfilter,
                              virConnectPtr conn)
 {
-    struct virSecretObjListGetHelperData data = {
-        .conn = conn, .aclfilter = aclfilter, .nuuids = 0,
-        .uuids = NULL, .maxuuids = -1, .error = false };
+    struct virSecretCountData data = {
+        .conn = conn, .aclfilter = aclfilter, .count = 0 };
 
     virObjectLock(secrets);
-    virHashForEach(secrets->objs, virSecretObjListGetHelper, &data);
+    virHashForEach(secrets->objs, virSecretObjListNumOfSecretsCallback, &data);
     virObjectUnlock(secrets);
 
-    return data.nuuids;
+    return data.count;
 }
 
 
@@ -626,12 +652,12 @@ virSecretObjListGetUUIDs(virSecretObjListPtr secrets,
                          virSecretObjListACLFilter aclfilter,
                          virConnectPtr conn)
 {
-    struct virSecretObjListGetHelperData data = {
-        .conn = conn, .aclfilter = aclfilter, .nuuids = 0,
-        .uuids = uuids, .maxuuids = maxuuids, .error = false };
+    struct virSecretListData data = {
+        .conn = conn, .aclfilter = aclfilter, .uuids = uuids, .nuuids = 0,
+        .maxuuids = maxuuids, .error = false };
 
     virObjectLock(secrets);
-    virHashForEach(secrets->objs, virSecretObjListGetHelper, &data);
+    virHashForEach(secrets->objs, virSecretObjListGetUUIDsCallback, &data);
     virObjectUnlock(secrets);
 
     if (data.error)