diff --git a/source/java/org/alfresco/repo/jscript/Search.java b/source/java/org/alfresco/repo/jscript/Search.java
index 6e0ba9a827..73392fefcb 100644
--- a/source/java/org/alfresco/repo/jscript/Search.java
+++ b/source/java/org/alfresco/repo/jscript/Search.java
@@ -714,6 +714,10 @@ public class Search extends BaseScopableProcessorExtension implements Initializi
                     SolrFacetHelper solrFacetHelper = services.getSolrFacetHelper();
                     for (String field: facets)
                     {
+                        if (field.isEmpty())
+                        {
+                            continue;
+                        }
                         final String modifiedField = "@" + field;
                         if (solrFacetHelper.hasFacetQueries(modifiedField))
                         {