diff --git a/lib/PostText/Controller/Thread.pm b/lib/PostText/Controller/Thread.pm
index aa87afd..f7ac201 100644
--- a/lib/PostText/Controller/Thread.pm
+++ b/lib/PostText/Controller/Thread.pm
@@ -76,24 +76,15 @@ sub by_page($self) {
     my $last_page = $self->thread->last_page;
     my $threads   = $self->thread->by_page($this_page);
 
-    if (my $first_thread = $threads->[0]) {
-        $self->stash(
-            threads   => $threads,
-            this_page => $this_page,
-            last_page => $last_page,
-            base_path => $base_path
-            )
-    }
-    else {
-        $self->stash(
-            threads   => [],
-            this_page => undef,
-            last_page => undef,
-            base_path => undef,
-            status    => 404,
-            error     => 'Page not found 🕵️'
-            )
-    }
+    $self->stash(
+        threads   => $threads,
+        this_page => $this_page,
+        last_page => $last_page,
+        base_path => $base_path
+        );
+
+    $self->stash(status => 404, error => 'Page not found 🕵️')
+        unless scalar @{$threads};
 
     $self->render;
 }
diff --git a/templates/thread/by_page.html.ep b/templates/thread/by_page.html.ep
index 1d60e20..4e43fbe 100644
--- a/templates/thread/by_page.html.ep
+++ b/templates/thread/by_page.html.ep
@@ -1,7 +1,7 @@
 % layout 'default';
 % title 'Threads List';
 <h2 class="page-title"><%= title %></h2>
-<% if (my $first_thread = $threads->[0]) { =%>
+<% if (scalar @{$threads}) { =%>
 <main class="pager">
   <% for my $thread (@{$threads}) { =%>
   <article class="post">