diff --git a/lib/pleroma/web/pleroma_api/views/chat_view.ex b/lib/pleroma/web/pleroma_api/views/chat_view.ex
index 08d5110c3..223b64987 100644
--- a/lib/pleroma/web/pleroma_api/views/chat_view.ex
+++ b/lib/pleroma/web/pleroma_api/views/chat_view.ex
@@ -14,7 +14,7 @@ defmodule Pleroma.Web.PleromaAPI.ChatView do
   def render("show.json", %{chat: %Chat{} = chat} = opts) do
     recipient = User.get_cached_by_ap_id(chat.recipient)
 
-    last_message = Chat.last_message_for_chat(chat)
+    last_message = opts[:message] || Chat.last_message_for_chat(chat)
 
     %{
       id: chat.id |> to_string(),
diff --git a/lib/pleroma/web/views/streamer_view.ex b/lib/pleroma/web/views/streamer_view.ex
index 949e2ed37..5e953d770 100644
--- a/lib/pleroma/web/views/streamer_view.ex
+++ b/lib/pleroma/web/views/streamer_view.ex
@@ -16,9 +16,9 @@ def render("chat_update.json", object, user, recipients) do
     chat = Chat.get(user.id, hd(recipients -- [user.ap_id]))
 
     representation =
-      Pleroma.Web.PleromaAPI.ChatMessageView.render(
+      Pleroma.Web.PleromaAPI.ChatView.render(
         "show.json",
-        %{object: object, chat: chat}
+        %{message: object, chat: chat}
       )
 
     %{