diff --git a/dev/Model/MessageCollection.js b/dev/Model/MessageCollection.js
index 4323659fe..93ec76cbb 100644
--- a/dev/Model/MessageCollection.js
+++ b/dev/Model/MessageCollection.js
@@ -28,10 +28,15 @@ export class MessageCollectionModel extends AbstractCollectionModel
 	 */
 	static reviveFromJson(object/*, cached*/) {
 		let msg = MessageUserStore.message();
-		return super.reviveFromJson(object, message =>
+		return super.reviveFromJson(object, message => {
 			// If message is currently viewed, use that.
-			// Maybe then use msg.revivePropertiesFromJson(message) ?
-			(msg && msg.hash === message.hash) ? msg : MessageModel.reviveFromJson(message)
-		);
+			if (msg && msg.hash === message.hash) {
+				msg.revivePropertiesFromJson(message);
+				message = msg;
+			} else {
+				message = MessageModel.reviveFromJson(message);
+			}
+			return message;
+		});
 	}
 }