diff --git a/lib/MetaCPAN/Model/Search.pm b/lib/MetaCPAN/Model/Search.pm
index a67adac47..e26a93223 100644
--- a/lib/MetaCPAN/Model/Search.pm
+++ b/lib/MetaCPAN/Model/Search.pm
@@ -47,7 +47,6 @@ sub search_for_first_result {
     my ( $self, $search_term ) = @_;
     my $es_query   = $self->build_query($search_term);
     my $es_results = $self->run_query( file => $es_query );
-    return unless $es_results->{hits}{total};
 
     my $data = $es_results->{hits}{hits}[0];
     single_valued_arrayref_to_scalar( $data->{fields} );
diff --git a/lib/MetaCPAN/Query/Favorite.pm b/lib/MetaCPAN/Query/Favorite.pm
index 4630a83fa..7dfbeb33d 100644
--- a/lib/MetaCPAN/Query/Favorite.pm
+++ b/lib/MetaCPAN/Query/Favorite.pm
@@ -8,7 +8,12 @@ with 'MetaCPAN::Query::Role::Common';
 
 sub agg_by_distributions {
     my ( $self, $distributions, $user ) = @_;
-    return unless $distributions;
+    return {
+        favorites   => {},
+        myfavorites => {},
+        took        => 0,
+        }
+        unless $distributions;
 
     my $body = {
         size  => 0,
diff --git a/lib/MetaCPAN/Query/File.pm b/lib/MetaCPAN/Query/File.pm
index d49b0490e..aabea5aaf 100644
--- a/lib/MetaCPAN/Query/File.pm
+++ b/lib/MetaCPAN/Query/File.pm
@@ -37,7 +37,6 @@ sub dir {
             body  => $body,
         }
     );
-    return unless $data->{hits}{total};
 
     my $dir = [ map { $_->{fields} } @{ $data->{hits}{hits} } ];
     single_valued_arrayref_to_scalar($dir);
diff --git a/lib/MetaCPAN/Query/Mirror.pm b/lib/MetaCPAN/Query/Mirror.pm
index ce3d4588a..05fc28ec1 100644
--- a/lib/MetaCPAN/Query/Mirror.pm
+++ b/lib/MetaCPAN/Query/Mirror.pm
@@ -53,7 +53,6 @@ sub search {
             @sort,
         },
     );
-    return unless $ret->{hits}{total};
 
     my $data = [
         map +{
diff --git a/lib/MetaCPAN/Query/Package.pm b/lib/MetaCPAN/Query/Package.pm
index c218e1b57..9ea50d8a6 100644
--- a/lib/MetaCPAN/Query/Package.pm
+++ b/lib/MetaCPAN/Query/Package.pm
@@ -28,7 +28,6 @@ sub get_modules {
         }
     );
 
-    return unless $res->{hits}{total};
     return +{ modules =>
             [ map { $_->{_source}{module_name} } @{ $res->{hits}{hits} } ] };
 }
diff --git a/lib/MetaCPAN/Query/Permission.pm b/lib/MetaCPAN/Query/Permission.pm
index af5ebba08..5fe315446 100644
--- a/lib/MetaCPAN/Query/Permission.pm
+++ b/lib/MetaCPAN/Query/Permission.pm
@@ -26,7 +26,6 @@ sub by_author {
         type  => 'permission',
         body  => $body,
     );
-    return unless $ret->{hits}{total};
 
     my $data = [
         sort { $a->{module_name} cmp $b->{module_name} }
@@ -42,7 +41,8 @@ sub by_modules {
 
     my @modules = map +{ term => { module_name => $_ } },
         grep defined, @{$modules};
-    return unless @modules;
+    return { permissions => [] }
+        unless @modules;
 
     my $body = {
         query => {
@@ -56,7 +56,6 @@ sub by_modules {
         type  => 'permission',
         body  => $body,
     );
-    return unless $ret->{hits}{total};
 
     my $data = [
         sort { $a->{module_name} cmp $b->{module_name} }
diff --git a/lib/MetaCPAN/Query/Rating.pm b/lib/MetaCPAN/Query/Rating.pm
index b803c09f4..346970058 100644
--- a/lib/MetaCPAN/Query/Rating.pm
+++ b/lib/MetaCPAN/Query/Rating.pm
@@ -31,7 +31,6 @@ sub by_distributions {
         type  => 'rating',
         body  => $body,
     );
-    return unless $ret->{hits}{total};
 
     my %distributions = map { $_->{key} => $_->{ratings_dist} }
         @{ $ret->{aggregations}{ratings}{buckets} };
diff --git a/lib/MetaCPAN/Query/Release.pm b/lib/MetaCPAN/Query/Release.pm
index 25c0888d0..da95b2629 100644
--- a/lib/MetaCPAN/Query/Release.pm
+++ b/lib/MetaCPAN/Query/Release.pm
@@ -8,7 +8,6 @@ with 'MetaCPAN::Query::Role::Common';
 
 sub author_status {
     my ( $self, $id, $file ) = @_;
-    return unless $id and $file;
 
     my $status = $file->{_source}
         || single_valued_arrayref_to_scalar( $file->{fields} );
@@ -364,7 +363,6 @@ sub by_author_and_name {
         type  => 'release',
         body  => $body,
     );
-    return unless $ret->{hits}{total};
 
     my $data = $ret->{hits}{hits}[0]{_source};
     single_valued_arrayref_to_scalar($data);
@@ -412,7 +410,6 @@ sub by_author_and_names {
         type  => 'release',
         body  => $body,
     );
-    return unless $ret->{hits}{total};
 
     my @releases;
     for my $hit ( @{ $ret->{hits}{hits} } ) {
@@ -454,7 +451,6 @@ sub by_author {
         type  => 'release',
         body  => $body,
     );
-    return unless $ret->{hits}{total};
 
     my $data = [ map { $_->{_source} } @{ $ret->{hits}{hits} } ];
     single_valued_arrayref_to_scalar($data);
@@ -491,7 +487,6 @@ sub latest_by_distribution {
         type  => 'release',
         body  => $body,
     );
-    return unless $ret->{hits}{total};
 
     my $data = $ret->{hits}{hits}[0]{_source};
     single_valued_arrayref_to_scalar($data);
@@ -526,7 +521,6 @@ sub latest_by_author {
         type  => 'release',
         body  => $body,
     );
-    return unless $ret->{hits}{total};
 
     my $data = [ map { $_->{fields} } @{ $ret->{hits}{hits} } ];
     single_valued_arrayref_to_scalar($data);
@@ -553,7 +547,6 @@ sub all_by_author {
         type  => 'release',
         body  => $body,
     );
-    return unless $ret->{hits}{total};
 
     my $data = [ map { $_->{fields} } @{ $ret->{hits}{hits} } ];
     single_valued_arrayref_to_scalar($data);
@@ -583,7 +576,6 @@ sub versions {
         type  => 'release',
         body  => $body,
     );
-    return unless $ret->{hits}{total};
 
     my $data = [ map { $_->{fields} } @{ $ret->{hits}{hits} } ];
     single_valued_arrayref_to_scalar($data);
@@ -676,7 +668,6 @@ sub requires {
             sort  => [$sort],
         }
     );
-    return {} unless $ret->{hits}{total};
 
     return +{
         data  => [ map { $_->{_source} } @{ $ret->{hits}{hits} } ],
@@ -718,7 +709,6 @@ sub _get_latest_release {
             fields => [qw< name author >],
         },
     );
-    return unless $release->{hits}{total};
 
     my ($release_info) = map { $_->{fields} } @{ $release->{hits}{hits} };
     single_valued_arrayref_to_scalar($release_info);
@@ -749,7 +739,6 @@ sub _get_provided_modules {
             size => 999,
         }
     );
-    return unless $provided_modules->{hits}{total};
 
     return [
         map      { $_->{name} }
@@ -805,7 +794,6 @@ sub _get_depended_releases {
             sort => $sort,
         }
     );
-    return unless $depended->{hits}{total};
 
     return +{
         data  => [ map { $_->{_source} } @{ $depended->{hits}{hits} } ],
@@ -858,7 +846,6 @@ sub recent {
         type  => 'release',
         body  => $body,
     );
-    return unless $ret->{hits}{total};
 
     my $data = [ map { $_->{fields} } @{ $ret->{hits}{hits} } ];
     single_valued_arrayref_to_scalar($data);
@@ -950,7 +937,6 @@ sub modules {
         type  => 'file',
         body  => $body,
     );
-    return unless $ret->{hits}{total};
 
     my @files = map +{
         %{ ( single_valued_arrayref_to_scalar( $_->{fields} ) )[0] },