diff --git a/lib/PiTube/Controller/Stream.pm b/lib/PiTube/Controller/Stream.pm
index d0b64c2071f0e75cae2d07c29208aef6be5c0fe1..94d390325a615497a0713d04e6102a8f34752808 100644
--- a/lib/PiTube/Controller/Stream.pm
+++ b/lib/PiTube/Controller/Stream.pm
@@ -25,6 +25,8 @@ sub list {
         ]
     };
 
+    $cond->{is_live} = 't' if $c->param('live');
+
     my $streams = $c->schema->resultset('Stream_view')->search(
         $cond,
         { order_by => 'name' }
@@ -37,13 +39,8 @@ sub list {
 
         my $rights = $c->session->{user}{acl}{ $stream->key };
 
-        if ( $c->param('live') ) {
-            next STREAM if ! $stream->is_live;
-        }
-
         my %stream = (
             $stream->get_columns(),
-            is_live       => $stream->is_live,
             is_writeable  => $stream->is_writeable( $rights ),
             is_recordable => $stream->is_recordable( $c->session->{user}{id} ),
         );
@@ -116,7 +113,6 @@ sub info {
 
     $c->stash->{stream} = {
         $stream->get_columns(),
-        is_live       => $stream->is_live,
         is_writeable  => $stream->is_writeable( $rights ),
         is_recordable => $stream->is_recordable( $c->session->{user}{id} ),
     };