diff --git a/lib/chiya/notes.ex b/lib/chiya/notes.ex
index 8d220a6..d0f8457 100644
--- a/lib/chiya/notes.ex
+++ b/lib/chiya/notes.ex
@@ -46,18 +46,20 @@ defmodule Chiya.Notes do
     |> Repo.preload(@preloads)
   end
 
-  def list_notes_by_channel_published(%Chiya.Channels.Channel{} = channel) do
+  def list_notes_by_channel_published(%Chiya.Channels.Channel{} = channel, count \\ 10) do
     list_notes_by_channel_query(channel)
     |> order_by([n], desc: n.published_at)
     |> where([n], not is_nil(n.published_at))
+    |> limit(^count)
     |> Repo.all()
     |> Repo.preload(@preloads)
   end
 
-  def list_notes_by_channel_updated(%Chiya.Channels.Channel{} = channel) do
+  def list_notes_by_channel_updated(%Chiya.Channels.Channel{} = channel, count \\ 10) do
     list_notes_by_channel_query(channel)
     |> order_by([n], desc: n.published_at)
     |> where([n], not is_nil(n.published_at))
+    |> limit(^count)
     |> Repo.all()
     |> Repo.preload(@preloads)
   end
diff --git a/lib/chiya_web/controllers/page_controller.ex b/lib/chiya_web/controllers/page_controller.ex
index 35944ca..d8c09a6 100644
--- a/lib/chiya_web/controllers/page_controller.ex
+++ b/lib/chiya_web/controllers/page_controller.ex
@@ -69,12 +69,13 @@ defmodule ChiyaWeb.PageController do
 
     [channel, notes_updated, notes_published] =
       case settings.wiki_channel_id do
-        nil -> 
-          [nil, nil]
-        id -> 
+        nil ->
+          [nil, nil, nil]
+
+        id ->
           channel = Chiya.Channels.get_channel!(id)
-          updated = Chiya.Notes.list_notes_by_channel_updated(channel)
-          published = Chiya.Notes.list_notes_by_channel_published(channel)
+          updated = Chiya.Notes.list_notes_by_channel_updated(channel, 5)
+          published = Chiya.Notes.list_notes_by_channel_published(channel, 5)
           [channel, updated, published]
       end