diff --git a/lib/architex/schema/event/formatters.ex b/lib/architex/schema/event/formatters.ex
index 15a17e5..d195dc5 100644
--- a/lib/architex/schema/event/formatters.ex
+++ b/lib/architex/schema/event/formatters.ex
@@ -12,7 +12,8 @@ defmodule Architex.Event.Formatters do
         sender: sender,
         origin_server_ts: origin_server_ts,
         unsigned: unsigned,
-        room_id: room_id
+        room_id: room_id,
+        state_key: state_key
       }) do
     data = %{
       content: content,
@@ -24,6 +25,7 @@ defmodule Architex.Event.Formatters do
     }
 
     data = if unsigned, do: Map.put(data, :unsigned, unsigned), else: data
+    data = if state_key, do: Map.put(data, :state_key, state_key), else: data
 
     data
   end
diff --git a/lib/architex/schema/room.ex b/lib/architex/schema/room.ex
index 74a31eb..24de78d 100644
--- a/lib/architex/schema/room.ex
+++ b/lib/architex/schema/room.ex
@@ -82,7 +82,7 @@ defmodule Architex.Room do
       |> limit(^limit)
       |> Repo.all()
 
-    {events, get_start(events), get_end(events, limit)}
+    {events, get_start(events, dir), get_end(events, limit, dir)}
   end
 
   defp order_by_direction(query, "b"), do: order_by(query, desc: :origin_server_ts, desc: :nid)
@@ -114,15 +114,24 @@ defmodule Architex.Room do
     where(query, [e], e.nid <= ^to)
   end
 
-  defp get_start([]), do: nil
+  defp get_start([], _), do: nil
 
-  defp get_start([%Event{nid: first_nid} | _]) do
+  defp get_start([%Event{nid: first_nid} | _], "f") do
     Integer.to_string(first_nid)
   end
 
-  defp get_end(events, limit) when length(events) < limit, do: nil
+  defp get_start(events, "b") do
+    %Event{nid: last_nid} = List.last(events)
+    Integer.to_string(last_nid)
+  end
 
-  defp get_end(events, _) do
+  defp get_end(events, limit, _) when length(events) < limit, do: nil
+
+  defp get_end([%Event{nid: first_nid} | _], _, "f") do
+    Integer.to_string(first_nid)
+  end
+
+  defp get_end(events, _, "b") do
     %Event{nid: last_nid} = List.last(events)
     Integer.to_string(last_nid)
   end