diff --git a/client/js/socket-events/mentions.ts b/client/js/socket-events/mentions.ts
index 8f71e1e2..98c28fe6 100644
--- a/client/js/socket-events/mentions.ts
+++ b/client/js/socket-events/mentions.ts
@@ -1,7 +1,17 @@
 import socket from "../socket";
 import {store} from "../store";
 import {ClientMention} from "../types";
+import {SharedMention} from "../../../shared/types/mention";
 
 socket.on("mentions:list", function (data) {
-	store.commit("mentions", data as ClientMention[]);
+	store.commit("mentions", data.map(sharedToClientMention));
 });
+
+function sharedToClientMention(shared: SharedMention): ClientMention {
+	const mention: ClientMention = {
+		...shared,
+		localetime: "", // TODO: can't be right
+		channel: null,
+	};
+	return mention;
+}