diff --git a/src/main/java/org/codelibs/fess/app/web/base/FessSearchAction.java b/src/main/java/org/codelibs/fess/app/web/base/FessSearchAction.java
index 31fb0330f..88c7c0511 100644
--- a/src/main/java/org/codelibs/fess/app/web/base/FessSearchAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/base/FessSearchAction.java
@@ -87,12 +87,16 @@ public abstract class FessSearchAction extends FessBaseAction {
 
     protected boolean favoriteSupport;
 
+    protected boolean thumbnailSupport;
+
     @Override
     public ActionResponse hookBefore(final ActionRuntime runtime) { // application may override
         searchLogSupport = fessConfig.isSearchLog();
         favoriteSupport = fessConfig.isUserFavorite();
+        thumbnailSupport = fessConfig.isThumbnailEnabled();
         runtime.registerData("searchLogSupport", searchLogSupport);
         runtime.registerData("favoriteSupport", favoriteSupport);
+        runtime.registerData("thumbnailSupport", thumbnailSupport);
         if (fessConfig.isWebApiPopularWord()) {
             runtime.registerData("popularWords", popularWordHelper.getWordList(null, null, null, null, null));
         }
diff --git a/src/main/java/org/codelibs/fess/app/web/screenshot/ScreenshotAction.java b/src/main/java/org/codelibs/fess/app/web/screenshot/ScreenshotAction.java
index 3b52f6324..f33a67cc3 100644
--- a/src/main/java/org/codelibs/fess/app/web/screenshot/ScreenshotAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/screenshot/ScreenshotAction.java
@@ -63,7 +63,7 @@ public class ScreenshotAction extends FessSearchAction {
                             return true;
                         }).orElse(null);
         final String url = DocumentUtil.getValue(doc, fessConfig.getIndexFieldUrl(), String.class);
-        if (StringUtil.isBlank(form.queryId) || StringUtil.isBlank(url) || screenShotManager == null) {
+        if (StringUtil.isBlank(form.queryId) || StringUtil.isBlank(url) || !thumbnailSupport) {
             // 404
             throw404("Screenshot for " + form.docId + " is not found.");
             return null;
diff --git a/src/main/java/org/codelibs/fess/app/web/search/SearchAction.java b/src/main/java/org/codelibs/fess/app/web/search/SearchAction.java
index 40cc03a6b..25f67e425 100644
--- a/src/main/java/org/codelibs/fess/app/web/search/SearchAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/search/SearchAction.java
@@ -127,11 +127,11 @@ public class SearchAction extends FessSearchAction {
             return asHtml(path_SearchJsp).renderWith(data -> {
                 renderData.register(data);
                 // favorite or screenshot
-                    if (favoriteSupport || screenShotManager != null) {
+                    if (favoriteSupport || thumbnailSupport) {
                         final String queryId = renderData.getQueryId();
                         final List<Map<String, Object>> documentItems = renderData.getDocumentItems();
                         userInfoHelper.storeQueryId(queryId, documentItems);
-                        if (screenShotManager != null) {
+                        if (thumbnailSupport) {
                             screenShotManager.storeRequest(queryId, documentItems);
                             RenderDataUtil.register(data, "screenShotSupport", true);
                         }