diff --git a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
index 730ac9caa..7a490067d 100644
--- a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
+++ b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
@@ -1065,11 +1065,13 @@ public class FessEsClient implements Client {
             queryContext.sortBuilders().forEach(sortBuilder -> searchRequestBuilder.addSort(sortBuilder));
 
             // highlighting
-            final HighlightBuilder highlightBuilder = new HighlightBuilder();
-            queryHelper.highlightedFields(stream -> stream.forEach(hf -> highlightBuilder.field(new HighlightBuilder.Field(hf)
-                    .highlighterType(highlightInfo.getType()).fragmentSize(highlightInfo.getFragmentSize())
-                    .numOfFragments(highlightInfo.getNumOfFragments()))));
-            searchRequestBuilder.highlighter(highlightBuilder);
+            if (highlightInfo != null) {
+                final HighlightBuilder highlightBuilder = new HighlightBuilder();
+                queryHelper.highlightedFields(stream -> stream.forEach(hf -> highlightBuilder.field(new HighlightBuilder.Field(hf)
+                        .highlighterType(highlightInfo.getType()).fragmentSize(highlightInfo.getFragmentSize())
+                        .numOfFragments(highlightInfo.getNumOfFragments()))));
+                searchRequestBuilder.highlighter(highlightBuilder);
+            }
 
             // facets
             if (facetInfo != null) {