diff --git a/client/web/compose/src/components/ModuleFields/Editor/Record.vue b/client/web/compose/src/components/ModuleFields/Editor/Record.vue
index a5bc04332..0b39d892d 100644
--- a/client/web/compose/src/components/ModuleFields/Editor/Record.vue
+++ b/client/web/compose/src/components/ModuleFields/Editor/Record.vue
@@ -441,7 +441,7 @@ export default {
 
       return this.findModuleByID({ namespace: this.namespace, moduleID }).then(async module => {
         const relatedField = module.fields.find(({ name }) => name === labelField)
-        const records = this.findRecordsByIDs(recordIDs).map(r => new compose.Record(module, r))
+        let records = this.findRecordsByIDs(recordIDs).map(r => new compose.Record(module, r))
         const mappedIDs = {}
 
         if (relatedField.kind === 'Record' && recordLabelField) {
@@ -480,6 +480,9 @@ export default {
           })
 
           await this.resolveUsers([...relatedUserIDs])
+        } else if (records.length === 0) {
+          await this.resolveRecords({ namespaceID, moduleID, recordIDs: [...recordIDs] })
+          records = this.findRecordsByIDs(recordIDs).map(r => new compose.Record(module, r))
         }
 
         records.forEach(record => {
diff --git a/client/web/compose/src/components/ModuleFields/Viewer/Record.vue b/client/web/compose/src/components/ModuleFields/Viewer/Record.vue
index f8f6a3993..3c51ad3f3 100644
--- a/client/web/compose/src/components/ModuleFields/Viewer/Record.vue
+++ b/client/web/compose/src/components/ModuleFields/Viewer/Record.vue
@@ -118,7 +118,7 @@ export default {
 
       return this.findModuleByID({ namespace: this.namespace, moduleID }).then(async module => {
         const relatedField = module.fields.find(({ name }) => name === labelField)
-        const records = this.findRecordsByIDs(recordIDs).map(r => new compose.Record(module, r))
+        let records = this.findRecordsByIDs(recordIDs).map(r => new compose.Record(module, r))
         const mappedIDs = {}
 
         if (relatedField.kind === 'Record' && recordLabelField) {
@@ -157,6 +157,9 @@ export default {
           })
 
           await this.resolveUsers([...relatedUserIDs])
+        } else if (records.length === 0) {
+          await this.resolveRecords({ namespaceID, moduleID, recordIDs: [...recordIDs] })
+          records = this.findRecordsByIDs(recordIDs).map(r => new compose.Record(module, r))
         }
 
         records.forEach(record => {