diff --git a/src/groups/data.js b/src/groups/data.js
index 19a1119b8e..c866902b4c 100644
--- a/src/groups/data.js
+++ b/src/groups/data.js
@@ -25,13 +25,8 @@ module.exports = function (Groups) {
 			return memo;
 		}, []);
 
-		let groupData;
 		const keys = groupNames.map(groupName => 'group:' + groupName);
-		if (fields.length) {
-			groupData = await db.getObjectsFields(keys, fields);
-		} else {
-			groupData = await db.getObjects(keys);
-		}
+		const groupData = await (fields.length ? db.getObjectsFields(keys, fields) : db.getObjects(keys));
 		if (ephemeralIdx.length) {
 			ephemeralIdx.forEach(function (idx) {
 				groupData[idx] = Groups.getEphemeralGroup(groupNames[idx]);
diff --git a/src/messaging/data.js b/src/messaging/data.js
index 9fbf14eb63..b20e514de4 100644
--- a/src/messaging/data.js
+++ b/src/messaging/data.js
@@ -18,13 +18,7 @@ module.exports = function (Messaging) {
 		}
 
 		const keys = mids.map(mid => 'message:' + mid);
-		let messages;
-		if (fields.length) {
-			messages = await db.getObjectsFields(keys, fields);
-		} else {
-			messages = await db.getObjects(keys);
-		}
-
+		const messages = await (fields.length ? db.getObjectsFields(keys, fields) : db.getObjects(keys));
 		messages.forEach(message => modifyMessage(message, fields));
 		return messages;
 	};
diff --git a/src/posts/data.js b/src/posts/data.js
index 8d5ea80bed..bc4ba790d1 100644
--- a/src/posts/data.js
+++ b/src/posts/data.js
@@ -15,12 +15,7 @@ module.exports = function (Posts) {
 			return [];
 		}
 		const keys = pids.map(pid => 'post:' + pid);
-		let postData;
-		if (fields.length) {
-			postData = await db.getObjectsFields(keys, fields);
-		} else {
-			postData = await db.getObjects(keys);
-		}
+		const postData = await (fields.length ? db.getObjectsFields(keys, fields) : db.getObjects(keys));
 		const result = await plugins.fireHook('filter:post.getFields', {
 			pids: pids,
 			posts: postData,