diff --git a/public/src/modules/helpers.common.js b/public/src/modules/helpers.common.js
index ae40828ead..706c44c6fa 100644
--- a/public/src/modules/helpers.common.js
+++ b/public/src/modules/helpers.common.js
@@ -125,29 +125,8 @@ module.exports = function (utils, Benchpress, relative_path) {
 	}
 
 	function generateTopicClass(topic) {
-		const style = [];
-
-		if (topic.locked) {
-			style.push('locked');
-		}
-
-		if (topic.pinned) {
-			style.push('pinned');
-		}
-
-		if (topic.deleted) {
-			style.push('deleted');
-		}
-
-		if (topic.unread) {
-			style.push('unread');
-		}
-
-		if (topic.scheduled) {
-			style.push('scheduled');
-		}
-
-		return style.join(' ');
+		const fields = ['locked', 'pinned', 'deleted', 'unread', 'scheduled'];
+		return fields.filter(field => !!topic[field]).join(' ');
 	}
 
 	// Groups helpers