diff --git a/client/web/compose/src/mixins/records.js b/client/web/compose/src/mixins/records.js
index 0eec6d794..5641d5a42 100644
--- a/client/web/compose/src/mixins/records.js
+++ b/client/web/compose/src/mixins/records.js
@@ -32,7 +32,10 @@ export default {
       // Dispatch resolution per module
       return Promise.all(Object.entries(moduleRecords).map(([moduleID, recordIDs]) => {
         recordIDs = [...recordIDs]
-        return this.$store.dispatch('record/resolveRecords', { namespaceID, moduleID, recordIDs })
+
+        if (recordIDs.length) {
+          return this.$store.dispatch('record/resolveRecords', { namespaceID, moduleID, recordIDs })
+        }
       }))
     },
   },
diff --git a/client/web/compose/src/mixins/users.js b/client/web/compose/src/mixins/users.js
index 0ddfbbfe1..d0de4cbaf 100644
--- a/client/web/compose/src/mixins/users.js
+++ b/client/web/compose/src/mixins/users.js
@@ -5,7 +5,7 @@ export default {
         return
       }
 
-      const list = new Set(records.map(r => {
+      const list = [...new Set(records.map(r => {
         return fields
           .filter(c => c.kind === 'User')
           .map(f => {
@@ -15,9 +15,11 @@ export default {
               return f.isMulti ? r.values[f.name] : [r.values[f.name]]
             }
           })
-      }).flat(Infinity))
+      }).flat(Infinity))]
 
-      return this.$store.dispatch('user/resolveUsers', [...list])
+      if (list.length) {
+        return this.$store.dispatch('user/resolveUsers', list)
+      }
     },
   },
 }