diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index f82f34de5..68494f047 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -603,12 +603,18 @@ def fetch_user_activities(user, reading_user, params \\ %{}) do
         |> Map.put(:muting_user, reading_user)
       end
 
+    pagination_type =
+      cond do
+        is_nil(params[:offset]) -> :keyset
+        true -> :offset
+      end
+
     %{
       godmode: params[:godmode],
       reading_user: reading_user
     }
     |> user_activities_recipients()
-    |> fetch_activities(params, :offset)
+    |> fetch_activities(params, pagination_type)
     |> Enum.reverse()
   end