diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/component/RewriteFieldListComponent.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/component/RewriteFieldListComponent.java
index 283070d32..c539c3c45 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/component/RewriteFieldListComponent.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/component/RewriteFieldListComponent.java
@@ -102,7 +102,7 @@ public class RewriteFieldListComponent extends SearchComponent {
             {
                 fieldListSet.add("*");
             }
-            else
+            else if (solrReturnFields.getLuceneFieldNames() != null)
             {
                 fieldListSet.addAll(solrReturnFields.getLuceneFieldNames().stream()
                         .map( field -> AlfrescoSolrDataModel.getInstance()