diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex
index cb435e031..7e71c156c 100644
--- a/lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/lib/pleroma/web/ostatus/ostatus_controller.ex
@@ -23,7 +23,10 @@ defmodule Pleroma.Web.OStatus.OStatusController do
   def feed(conn, %{"nickname" => nickname} = params) do
     user = User.get_cached_by_nickname(nickname)
 
-    activities = ActivityPub.fetch_public_activities(%{"whole_db" => true, "actor_id" => user.ap_id})
+    query_params = Map.take(params, ["max_id"])
+    |> Map.merge(%{"whole_db" => true, "actor_id" => user.ap_id})
+
+    activities = ActivityPub.fetch_public_activities(query_params)
     |> Enum.reverse
 
     response = user