diff --git a/Koha/SearchEngine/Elasticsearch/Search.pm b/Koha/SearchEngine/Elasticsearch/Search.pm
index c88345bb58..64fce64de5 100644
--- a/Koha/SearchEngine/Elasticsearch/Search.pm
+++ b/Koha/SearchEngine/Elasticsearch/Search.pm
@@ -526,8 +526,8 @@ sub _convert_facets {
                 facet_count       => $c,
                 facet_link_value  => $t,
                 facet_title_value => $t,
-                facet_label_value => $label,    # TODO either truncate this,
-                                                # or make the template do it like it should anyway
+                facet_label_value => $label || q{},    # TODO either truncate this,
+                                                       # or make the template do it like it should anyway
                 type_link_value   => $type,
             };
         }
diff --git a/t/db_dependent/Koha/SearchEngine/Elasticsearch/Search.t b/t/db_dependent/Koha/SearchEngine/Elasticsearch/Search.t
index 5e71ba5f31..d5b8790abe 100755
--- a/t/db_dependent/Koha/SearchEngine/Elasticsearch/Search.t
+++ b/t/db_dependent/Koha/SearchEngine/Elasticsearch/Search.t
@@ -17,7 +17,8 @@
 
 use Modern::Perl;
 
-use Test::More tests => 14;
+use Test::More tests => 15;
+use Test::NoWarnings;
 use t::lib::Mocks;
 use t::lib::TestBuilder;