diff --git a/lib/pleroma/web/activity_pub/side_effects.ex b/lib/pleroma/web/activity_pub/side_effects.ex
index f0f0659c2..a4de8691e 100644
--- a/lib/pleroma/web/activity_pub/side_effects.ex
+++ b/lib/pleroma/web/activity_pub/side_effects.ex
@@ -14,6 +14,7 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.Web.ActivityPub.Pipeline
   alias Pleroma.Web.ActivityPub.Utils
+  alias Pleroma.Web.Streamer
 
   def handle(object, meta \\ [])
 
@@ -126,6 +127,7 @@ def handle(object, meta) do
 
   def handle_object_creation(%{"type" => "ChatMessage"} = object, meta) do
     with {:ok, object, meta} <- Pipeline.common_pipeline(object, meta) do
+      Streamer.stream(["user", "user:pleroma_chat"], object)
       actor = User.get_cached_by_ap_id(object.data["actor"])
       recipient = User.get_cached_by_ap_id(hd(object.data["to"]))
 
diff --git a/test/web/activity_pub/side_effects_test.exs b/test/web/activity_pub/side_effects_test.exs
index fb4411c07..210ba6ef0 100644
--- a/test/web/activity_pub/side_effects_test.exs
+++ b/test/web/activity_pub/side_effects_test.exs
@@ -309,6 +309,27 @@ test "notifies the recipient" do
       assert Repo.get_by(Notification, user_id: recipient.id, activity_id: create_activity.id)
     end
 
+    test "it streams the created ChatMessage" do
+      author = insert(:user, local: true)
+      recipient = insert(:user, local: true)
+
+      {:ok, chat_message_data, _meta} = Builder.chat_message(author, recipient.ap_id, "hey")
+
+      {:ok, create_activity_data, _meta} =
+        Builder.create(author, chat_message_data["id"], [recipient.ap_id])
+
+      {:ok, create_activity, _meta} = ActivityPub.persist(create_activity_data, local: false)
+
+      with_mock Pleroma.Web.Streamer, [], stream: fn _, _ -> nil end do
+        {:ok, _create_activity, _meta} =
+          SideEffects.handle(create_activity, local: false, object_data: chat_message_data)
+
+        object = Object.normalize(create_activity, false)
+
+        assert called(Pleroma.Web.Streamer.stream(["user", "user:pleroma_chat"], object))
+      end
+    end
+
     test "it creates a Chat for the local users and bumps the unread count, except for the author" do
       author = insert(:user, local: true)
       recipient = insert(:user, local: true)