diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/AnalyzerGuru.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/AnalyzerGuru.java
index c64675bd5a6..a8396f7fe92 100644
--- a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/AnalyzerGuru.java
+++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/AnalyzerGuru.java
@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2017, 2021, Chris Fraire <cfraire@me.com>.
  */
 package org.opengrok.indexer.analysis;
@@ -596,7 +596,7 @@ public void populateDocument(Document doc, File file, String path, AbstractAnaly
         doc.add(new SortedDocValuesField(QueryBuilder.FULLPATH,
                 new BytesRef(file.getAbsolutePath())));
 
-        if (RuntimeEnvironment.getInstance().isHistoryEnabled()) {
+        if (HistoryGuru.getInstance().repositorySupportsHistory(file)) {
             populateDocumentHistory(doc, file);
         }
         doc.add(new Field(QueryBuilder.DATE, date, string_ft_stored_nanalyzed_norms));
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/Configuration.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/Configuration.java
index 11ecca956f5..8dceda0346e 100644
--- a/opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/Configuration.java
+++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/Configuration.java
@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2017, 2020, Chris Fraire <cfraire@me.com>.
  * Portions Copyright (c) 2020, Aleksandr Kirillov <alexkirillovsamara@gmail.com>.
  */
@@ -580,7 +580,7 @@ public Configuration() {
         setHandleHistoryOfRenamedFiles(false);
         setHistoryBasedReindex(true);
         setHistoryCache(true);
-        setHistoryEnabled(true);
+        setHistoryEnabled(false);
         setHitsPerPage(25);
         setIgnoredNames(new IgnoredNames());
         setIncludedNames(new Filter());
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/history/HistoryGuru.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/history/HistoryGuru.java
index 683b180c856..7066469d060 100644
--- a/opengrok-indexer/src/main/java/org/opengrok/indexer/history/HistoryGuru.java
+++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/history/HistoryGuru.java
@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2017, 2020, Chris Fraire <cfraire@me.com>.
  */
 package org.opengrok.indexer.history;
@@ -54,7 +54,6 @@
 import org.opengrok.indexer.analysis.AnalyzerFactory;
 import org.opengrok.indexer.analysis.AnalyzerGuru;
 import org.opengrok.indexer.configuration.CommandTimeoutType;
-import org.opengrok.indexer.configuration.Configuration;
 import org.opengrok.indexer.configuration.Configuration.RemoteSCM;
 import org.opengrok.indexer.configuration.OpenGrokThreadFactory;
 import org.opengrok.indexer.configuration.PathAccepter;
@@ -630,6 +629,14 @@ public boolean hasHistory(File file) {
             }
         }
 
+        return repositorySupportsHistory(file);
+    }
+
+    /**
+     * @param file {@link File} object for a file under source root
+     * @return whether related {@link Repository} and settings allow for history retrieval
+     */
+    public boolean repositorySupportsHistory(File file) {
         Repository repo = getRepository(file);
         if (repo == null) {
             LOGGER.finest(() -> String.format("cannot find repository for '%s' to check history presence",
@@ -642,7 +649,7 @@ public boolean hasHistory(File file) {
         }
 
         // This should return true for Annotate view.
-        Configuration.RemoteSCM globalRemoteSupport = env.getRemoteScmSupported();
+        RemoteSCM globalRemoteSupport = env.getRemoteScmSupported();
         boolean remoteSupported = ((globalRemoteSupport == RemoteSCM.ON)
                 || (globalRemoteSupport == RemoteSCM.UIONLY)
                 || (globalRemoteSupport == RemoteSCM.DIRBASED)
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/history/LatestRevisionUtil.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/history/LatestRevisionUtil.java
index f2ed898474c..7b7e2e66f45 100644
--- a/opengrok-indexer/src/main/java/org/opengrok/indexer/history/LatestRevisionUtil.java
+++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/history/LatestRevisionUtil.java
@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  */
 package org.opengrok.indexer.history;
 
@@ -26,7 +26,6 @@
 import org.apache.lucene.document.Document;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.VisibleForTesting;
-import org.opengrok.indexer.configuration.RuntimeEnvironment;
 import org.opengrok.indexer.index.IndexDatabase;
 import org.opengrok.indexer.logger.LoggerFactory;
 import org.opengrok.indexer.search.QueryBuilder;
@@ -52,11 +51,11 @@ private LatestRevisionUtil() {
 
     /**
      * @param file file object corresponding to a file under source root
-     * @return last revision string for {@code file} or null
+     * @return last revision string for {@code file} or {@code null}
      */
     @Nullable
     public static String getLatestRevision(File file) {
-        if (!RuntimeEnvironment.getInstance().isHistoryEnabled()) {
+        if (!HistoryGuru.getInstance().repositorySupportsHistory(file)) {
             return null;
         }
 
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexDatabase.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexDatabase.java
index 8242fe20b44..b9eca106406 100644
--- a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexDatabase.java
+++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexDatabase.java
@@ -1283,10 +1283,9 @@ private static void createAnnotationCache(File file, Document doc) {
         }
     }
 
-    private AbstractAnalyzer getAnalyzerFor(File file, String path)
-            throws IOException {
-        try (InputStream in = new BufferedInputStream(
-                new FileInputStream(file))) {
+    @VisibleForTesting
+    static AbstractAnalyzer getAnalyzerFor(File file, String path) throws IOException {
+        try (InputStream in = new BufferedInputStream(new FileInputStream(file))) {
             return AnalyzerGuru.getAnalyzer(in, path);
         }
     }
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/Indexer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/Indexer.java
index ccbdc0d03fa..945dd90b113 100644
--- a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/Indexer.java
+++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/Indexer.java
@@ -1026,8 +1026,6 @@ public static String[] parseOptions(String[] argv) throws ParseException {
             cfg = new Configuration();
         }
 
-        cfg.setHistoryEnabled(false);  // force user to turn on history capture
-
         argv = optParser.parse(argv);
 
         return argv;
diff --git a/opengrok-indexer/src/test/java/org/opengrok/indexer/history/FileAnnotationCacheTest.java b/opengrok-indexer/src/test/java/org/opengrok/indexer/history/FileAnnotationCacheTest.java
index 7da38f19f92..13d1fe0a062 100644
--- a/opengrok-indexer/src/test/java/org/opengrok/indexer/history/FileAnnotationCacheTest.java
+++ b/opengrok-indexer/src/test/java/org/opengrok/indexer/history/FileAnnotationCacheTest.java
@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  */
 package org.opengrok.indexer.history;
 
@@ -61,6 +61,8 @@ void setUp() throws Exception {
         repositories = new TestRepository();
         repositories.create(getClass().getResource("/repositories"));
 
+        env.setHistoryEnabled(true);
+
         // This needs to be set before the call to env.setRepositories() below as it instantiates HistoryGuru.
         env.setAnnotationCacheEnabled(true);
 
diff --git a/opengrok-indexer/src/test/java/org/opengrok/indexer/history/FileHistoryCacheTest.java b/opengrok-indexer/src/test/java/org/opengrok/indexer/history/FileHistoryCacheTest.java
index d80866f8395..ceeed564aac 100644
--- a/opengrok-indexer/src/test/java/org/opengrok/indexer/history/FileHistoryCacheTest.java
+++ b/opengrok-indexer/src/test/java/org/opengrok/indexer/history/FileHistoryCacheTest.java
@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2018, 2020, Chris Fraire <cfraire@me.com>.
  * Portions Copyright (c) 2020, 2023, Ric Harris <harrisric@users.noreply.github.com>.
  */
@@ -55,6 +55,7 @@
 import org.apache.commons.lang3.time.DateUtils;
 import org.eclipse.jgit.api.Git;
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledOnOs;
@@ -90,6 +91,12 @@ class FileHistoryCacheTest {
     private boolean savedIsHandleHistoryOfRenamedFiles;
     private boolean savedIsTagsEnabled;
 
+    @BeforeAll
+    static void setUpClass() throws Exception {
+        RuntimeEnvironment env = RuntimeEnvironment.getInstance();
+        env.setHistoryEnabled(true);
+    }
+
     /**
      * Set up the test environment with repositories and a cache instance.
      */
diff --git a/opengrok-indexer/src/test/java/org/opengrok/indexer/history/HistoryGuruTest.java b/opengrok-indexer/src/test/java/org/opengrok/indexer/history/HistoryGuruTest.java
index 6d0adb16b71..cd78582194e 100644
--- a/opengrok-indexer/src/test/java/org/opengrok/indexer/history/HistoryGuruTest.java
+++ b/opengrok-indexer/src/test/java/org/opengrok/indexer/history/HistoryGuruTest.java
@@ -90,6 +90,7 @@ class HistoryGuruTest {
     @BeforeAll
     static void setUpClass() throws Exception {
         env = RuntimeEnvironment.getInstance();
+        env.setHistoryEnabled(true);
         env.setAnnotationCacheEnabled(true);
         savedNestingMaximum = env.getNestingMaximum();
 
diff --git a/opengrok-indexer/src/test/java/org/opengrok/indexer/history/MercurialRepositoryTest.java b/opengrok-indexer/src/test/java/org/opengrok/indexer/history/MercurialRepositoryTest.java
index f82e544826d..40c4ad02fc5 100644
--- a/opengrok-indexer/src/test/java/org/opengrok/indexer/history/MercurialRepositoryTest.java
+++ b/opengrok-indexer/src/test/java/org/opengrok/indexer/history/MercurialRepositoryTest.java
@@ -25,6 +25,7 @@
 
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -108,6 +109,12 @@ private void setUpTestRepository() throws IOException, URISyntaxException {
         repositoryRoot = new File(repository.getSourceRoot(), "mercurial");
     }
 
+    @BeforeAll
+    static void setUpClass() throws Exception {
+        RuntimeEnvironment env = RuntimeEnvironment.getInstance();
+        env.setHistoryEnabled(true);
+    }
+
     @BeforeEach
     void setup() throws IOException, URISyntaxException {
         setUpTestRepository();
diff --git a/opengrok-indexer/src/test/java/org/opengrok/indexer/index/AnalyzerGuruDocumentTest.java b/opengrok-indexer/src/test/java/org/opengrok/indexer/index/AnalyzerGuruDocumentTest.java
new file mode 100644
index 00000000000..8accff69b41
--- /dev/null
+++ b/opengrok-indexer/src/test/java/org/opengrok/indexer/index/AnalyzerGuruDocumentTest.java
@@ -0,0 +1,112 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * See LICENSE.txt included in this distribution for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at LICENSE.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ */
+package org.opengrok.indexer.index;
+
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.TextField;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
+import org.opengrok.indexer.analysis.AbstractAnalyzer;
+import org.opengrok.indexer.analysis.AnalyzerGuru;
+import org.opengrok.indexer.configuration.CommandTimeoutType;
+import org.opengrok.indexer.configuration.RuntimeEnvironment;
+import org.opengrok.indexer.history.HistoryGuru;
+import org.opengrok.indexer.history.Repository;
+import org.opengrok.indexer.history.RepositoryFactory;
+import org.opengrok.indexer.search.QueryBuilder;
+import org.opengrok.indexer.util.NullWriter;
+import org.opengrok.indexer.util.TestRepository;
+
+import java.io.File;
+import java.io.Writer;
+import java.net.URL;
+import java.nio.file.Path;
+import java.util.HashMap;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.atLeast;
+import static org.mockito.Mockito.verify;
+
+class AnalyzerGuruDocumentTest {
+    private RuntimeEnvironment env;
+
+    private static TestRepository testRepository;
+
+    @BeforeEach
+    void setUpClass() throws Exception {
+        env = RuntimeEnvironment.getInstance();
+
+        testRepository = new TestRepository();
+        URL resourceURL = HistoryGuru.class.getResource("/repositories");
+        assertNotNull(resourceURL);
+        testRepository.create(resourceURL);
+
+        env.setSourceRoot(testRepository.getSourceRoot());
+        env.setDataRoot(testRepository.getDataRoot());
+        env.setHistoryEnabled(true);
+        env.setProjectsEnabled(true);
+        RepositoryFactory.initializeIgnoredNames(env);
+
+        // Restore the project and repository information.
+        env.setProjects(new HashMap<>());
+        env.setRepositories(testRepository.getSourceRoot());
+        HistoryGuru.getInstance().invalidateRepositories(env.getRepositories(), CommandTimeoutType.INDEXER);
+        env.generateProjectRepositoriesMap();
+    }
+
+    @AfterEach
+    void tearDownClass() throws Exception {
+        testRepository.destroy();
+    }
+
+    /**
+     * {@link AnalyzerGuru#populateDocument(Document, File, String, AbstractAnalyzer, Writer)} should populate
+     * the history of the document only if the repository related to the file allows for it.
+     */
+    @ParameterizedTest
+    @ValueSource(booleans = {false, true})
+    void testPopulateDocumentHistory(boolean historyEnabled) throws Exception {
+        AnalyzerGuru analyzerGuru = new AnalyzerGuru();
+        Document doc = Mockito.mock(Document.class);
+        Path filePath = Path.of(env.getSourceRootPath(), "git", "main.c");
+        File file = filePath.toFile();
+        assertTrue(file.exists());
+        HistoryGuru histGuru = HistoryGuru.getInstance();
+        Repository repository = histGuru.getRepository(file);
+        assertNotNull(repository);
+        repository.setHistoryEnabled(historyEnabled);
+        String relativePath = env.getPathRelativeToSourceRoot(file);
+        analyzerGuru.populateDocument(doc, file, relativePath,
+                IndexDatabase.getAnalyzerFor(file, relativePath), new NullWriter());
+        ArgumentCaptor<TextField> argument = ArgumentCaptor.forClass(TextField.class);
+        verify(doc, atLeast(1)).add(argument.capture());
+        assertEquals(historyEnabled,
+                argument.getAllValues().stream().anyMatch(e -> e.name().equals(QueryBuilder.HIST)));
+    }
+}
diff --git a/opengrok-indexer/src/test/java/org/opengrok/indexer/index/IndexerVsDeletedDocumentsTest.java b/opengrok-indexer/src/test/java/org/opengrok/indexer/index/IndexerVsDeletedDocumentsTest.java
index e0810f6ad54..cc81c443fe0 100644
--- a/opengrok-indexer/src/test/java/org/opengrok/indexer/index/IndexerVsDeletedDocumentsTest.java
+++ b/opengrok-indexer/src/test/java/org/opengrok/indexer/index/IndexerVsDeletedDocumentsTest.java
@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  */
 package org.opengrok.indexer.index;
 
@@ -36,6 +36,7 @@
 import org.eclipse.jgit.treewalk.TreeWalk;
 import org.eclipse.jgit.treewalk.filter.PathFilter;
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -81,6 +82,12 @@
 class IndexerVsDeletedDocumentsTest {
     RuntimeEnvironment env = RuntimeEnvironment.getInstance();
 
+    @BeforeAll
+    static void setUpClass() {
+        RuntimeEnvironment env = RuntimeEnvironment.getInstance();
+        env.setHistoryEnabled(true);
+    }
+
     private static String getRandomString(int numChars) {
         Random random = new Random();
         final StringBuilder sb = new StringBuilder();
diff --git a/opengrok-indexer/src/test/java/org/opengrok/indexer/search/context/HistoryContextTest.java b/opengrok-indexer/src/test/java/org/opengrok/indexer/search/context/HistoryContextTest.java
index e582bcb85fa..19866f2c917 100644
--- a/opengrok-indexer/src/test/java/org/opengrok/indexer/search/context/HistoryContextTest.java
+++ b/opengrok-indexer/src/test/java/org/opengrok/indexer/search/context/HistoryContextTest.java
@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2017, Chris Fraire <cfraire@me.com>.
  */
 package org.opengrok.indexer.search.context;
@@ -64,9 +64,12 @@ class HistoryContextTest {
 
     @BeforeAll
     static void setUpClass() throws Exception {
+        RuntimeEnvironment env = RuntimeEnvironment.getInstance();
+        env.setHistoryEnabled(true);
+
         repositories = new TestRepository();
         repositories.create(HistoryContextTest.class.getResource("/repositories"));
-        RuntimeEnvironment.getInstance().setRepositories(repositories.getSourceRoot());
+        env.setRepositories(repositories.getSourceRoot());
     }
 
     @AfterAll
diff --git a/opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/ProjectsController.java b/opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/ProjectsController.java
index a323c3b1713..4e578d440f7 100644
--- a/opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/ProjectsController.java
+++ b/opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/ProjectsController.java
@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2020, Chris Fraire <cfraire@me.com>.
  */
 package org.opengrok.web.api.v1.controller;
@@ -113,7 +113,7 @@ private void addProjectWorkHorse(String projectName) {
         if (!env.getProjects().containsKey(projectName)) {
             Project project = new Project(projectName, "/" + projectName);
 
-            if (env.isHistoryEnabled()) {
+            if (project.isHistoryEnabled()) {
                 // Add repositories in this project.
                 List<RepositoryInfo> repos = getRepositoriesInDir(projDir);
 
@@ -130,7 +130,7 @@ private void addProjectWorkHorse(String projectName) {
             Project project = env.getProjects().get(projectName);
             Map<Project, List<RepositoryInfo>> map = env.getProjectRepositoriesMap();
 
-            if (env.isHistoryEnabled()) {
+            if (project.isHistoryEnabled()) {
                 // Refresh the list of repositories of this project.
                 // This is the goal of this action: if an existing project
                 // is re-added, this means its list of repositories has changed.
@@ -202,7 +202,7 @@ private void deleteProjectWorkHorse(Project project) {
             group.getProjects().remove(project);
         }
 
-        if (env.isHistoryEnabled()) {
+        if (project.isHistoryEnabled()) {
             // Now remove the repositories associated with this project.
             List<RepositoryInfo> repos = env.getProjectRepositoriesMap().get(project);
             if (repos != null) {
@@ -302,11 +302,11 @@ private Project getProjectFromName(String projectNameParam) {
     public Response deleteHistoryCache(@Context HttpServletRequest request,
                                        @PathParam("project") String projectNameParam) {
 
-        if (!env.isHistoryEnabled()) {
+        Project project = getProjectFromName(projectNameParam);
+        if (!project.isHistoryEnabled()) {
             return Response.status(Response.Status.NO_CONTENT).build();
         }
 
-        Project project = getProjectFromName(projectNameParam);
         List<RepositoryInfo> repos = env.getProjectRepositoriesMap().get(project);
         if (repos == null || repos.isEmpty()) {
             LOGGER.log(Level.INFO, NO_REPO_LOG_MSG, project.getName());
diff --git a/opengrok-web/src/main/webapp/help.jsp b/opengrok-web/src/main/webapp/help.jsp
index 557feebb833..add38b83188 100644
--- a/opengrok-web/src/main/webapp/help.jsp
+++ b/opengrok-web/src/main/webapp/help.jsp
@@ -16,7 +16,7 @@ information: Portions Copyright [yyyy] [name of copyright owner]
 
 CDDL HEADER END
 
-Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
 Portions Copyright 2011 Jens Elkner.
 Portions Copyright (c) 2018, 2020, Chris Fraire <cfraire@me.com>.
 Portions Copyright (c) 2022, Krystof Tulinger <k.tulinger@seznam.cz>.
@@ -184,14 +184,8 @@ A <dfn>Query</dfn> is a series of clauses. A clause may be prefixed by:
     <dt>path</dt>
     <dd>path of the source file (no need to use dividers, or if, then use "/" - Windows users, "\" is an escape key in Lucene query syntax! <br/>Please don't use "\", or replace it with "/").<br/>Also note that if you want just exact path, enclose it in "", e.g. "src/mypath", otherwise dividers will be removed and you get more hits.</dd>
 
-    <%
-        if (PageConfig.get(request).getEnv().isHistoryEnabled()) {
-    %>
     <dt>hist</dt>
     <dd>History log comments.</dd>
-    <%
-        }
-    %>
 
     <dt>type</dt>
     <dd>Type of analyzer used to scope down to certain file types (e.g. just C sources).<br/>Current mappings: <%=SearchHelper.getFileTypeDescriptions().toString()%></dd>
diff --git a/opengrok-web/src/main/webapp/list.jsp b/opengrok-web/src/main/webapp/list.jsp
index 3002b6ef453..be8ac04f2e4 100644
--- a/opengrok-web/src/main/webapp/list.jsp
+++ b/opengrok-web/src/main/webapp/list.jsp
@@ -16,7 +16,7 @@ information: Portions Copyright [yyyy] [name of copyright owner]
 
 CDDL HEADER END
 
-Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
 Portions Copyright 2011 Jens Elkner.
 Portions Copyright (c) 2017-2020, Chris Fraire <cfraire@me.com>.
 
@@ -62,7 +62,7 @@ org.opengrok.web.DirectoryListing"
     cfg.checkSourceRootExistence();
 
     String rev = cfg.getRequestedRevision();
-    if (!cfg.isDir() && rev.length() == 0) {
+    if (!cfg.isDir() && rev.isEmpty()) {
         /*
          * Get the latest revision and redirect so that the revision number
          * appears in the URL.
diff --git a/opengrok-web/src/main/webapp/menu.jspf b/opengrok-web/src/main/webapp/menu.jspf
index edea73bd4ee..8a2a320d11c 100644
--- a/opengrok-web/src/main/webapp/menu.jspf
+++ b/opengrok-web/src/main/webapp/menu.jspf
@@ -16,7 +16,7 @@ information: Portions Copyright [yyyy] [name of copyright owner]
 
 CDDL HEADER END
 
-Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
 Portions Copyright 2011 Jens Elkner.
 Portions Copyright (c) 2020, Chris Fraire <cfraire@me.com>.
 
@@ -45,7 +45,7 @@ org.opengrok.indexer.web.messages.MessagesUtils"
     String messages;
     Set<Project> projects = ph.getAllProjects();
     int projectsSize = ph.getAllUngrouped().size();
-    if (ph.getGroups().size() > 0 && ph.getAllUngrouped().size() > 0)
+    if (!ph.getGroups().isEmpty() && !ph.getAllUngrouped().isEmpty())
         projectsSize++;
     for (Group group : ph.getGroups()) {
         projectsSize++;
@@ -61,7 +61,7 @@ document.domReady.push(function() { domReadyMenu(); });
 <div id="qtbl">
     <table aria-label="query table">
     <%
-    if (projects.size() != 0) {
+    if (!projects.isEmpty()) {
     %>
     <tbody id="ptbl">
     <tr>
@@ -75,7 +75,7 @@ document.domReady.push(function() { domReadyMenu(); });
         SortedSet<String> pRequested = new TreeSet<>(cfg.getRequestedProjects());
         for (Group group : ph.getGroups()) {
             Set<Project> groupProjects = ph.getAllGrouped(group);
-            if (groupProjects.size() > 0) {
+            if (!groupProjects.isEmpty()) {
                 %><optgroup label="<%= group.getName() %>"><%
                 for (Project p : groupProjects) {
                     if (!p.isIndexed()) {
@@ -100,7 +100,7 @@ document.domReady.push(function() { domReadyMenu(); });
         }
 
         // Handle projects not listed in any group.
-        if (ph.getGroups().size() > 0 && ph.getAllUngrouped().size() > 0) {
+        if (!ph.getGroups().isEmpty() && !ph.getAllUngrouped().isEmpty()) {
             %><optgroup label="Other"><%
         }
         for (Project p : ph.getAllUngrouped()) {
@@ -118,7 +118,7 @@ document.domReady.push(function() { domReadyMenu(); });
             }
             %>><%= Util.formQuoteEscape(p.getName()) %></option><%
         }
-        if (ph.getGroups().size() > 0 && ph.getAllUngrouped().size() > 0) {
+        if (!ph.getGroups().isEmpty() && !ph.getAllUngrouped().isEmpty()) {
             %></optgroup><%
         }
     %></select>
@@ -177,9 +177,6 @@ document.domReady.push(function() { domReadyMenu(); });
             id="<%= QueryParameters.PATH_SEARCH_PARAM %>" type="text" value="<%=
             Util.formQuoteEscape(queryParams.getPath()) %>"/></td>
     </tr>
-    <%
-        if (cfg.getEnv().isHistoryEnabled()) {
-    %>
     <tr>
         <td><label for="<%= QueryParameters.HIST_SEARCH_PARAM %>"
               title="Search in project(s) repository log messages">History</label></td>
@@ -188,9 +185,6 @@ document.domReady.push(function() { domReadyMenu(); });
             id="<%= QueryParameters.HIST_SEARCH_PARAM %>" type="text" value="<%=
             Util.formQuoteEscape(queryParams.getHist()) %>"/></td>
     </tr>
-    <%
-        }
-    %>
     <tr>
         <td id="typeLabelTd"><label for="<%= QueryParameters.TYPE_SEARCH_PARAM %>">Type</label></td>
         <td><select class="q" tabindex="6" name="<%= QueryParameters.TYPE_SEARCH_PARAM %>"
diff --git a/opengrok-web/src/main/webapp/minisearch.jspf b/opengrok-web/src/main/webapp/minisearch.jspf
index daf1a0e6eb7..ac5222e05a3 100644
--- a/opengrok-web/src/main/webapp/minisearch.jspf
+++ b/opengrok-web/src/main/webapp/minisearch.jspf
@@ -16,7 +16,7 @@ information: Portions Copyright [yyyy] [name of copyright owner]
 
 CDDL HEADER END
 
-Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
 Portions Copyright (c) 2020, Chris Fraire <cfraire@me.com>.
 --%>
 <%@ page session="false" errorPage="error.jsp" import="
@@ -35,13 +35,11 @@ org.opengrok.indexer.web.Util"%><%
 <div id="bar">
     <ul>
         <li><a href="<%= context %>/"><span id="home"></span>Home</a></li><%
-    if (cfg.getEnv().isHistoryEnabled()) {
-        if (!cfg.hasHistory()) {
-            %><li><span id="history"></span><span class="c">History</span></li><%
-        } else {
-            %><li><a href="<%= context + Prefix.HIST_L + cfg.getUriEncodedPath()
-                %>"><span id="history"></span>History</a></li><%
-        }
+    if (!cfg.hasHistory()) {
+        %><li><span id="history"></span><span class="c">History</span></li><%
+    } else {
+        %><li><a href="<%= context + Prefix.HIST_L + cfg.getUriEncodedPath()
+            %>"><span id="history"></span>History</a></li><%
     }
     if (!cfg.hasAnnotations() /* || cfg.getPrefix() == Prefix.HIST_S */ ) {
         %><li><span class="c"><span class="annotate"></span>Annotate</span></li><%
@@ -87,11 +85,11 @@ org.opengrok.indexer.web.Util"%><%
         }
         %>
 	<li><a href="<%= context + Prefix.RAW_P + cfg.getUriEncodedPath() +
-            (cfg.getRequestedRevision().length() == 0 ? "" : "?" +
+            (cfg.getRequestedRevision().isEmpty() ? "" : "?" +
             QueryParameters.REVISION_PARAM_EQ + Util.uriEncode(cfg.getRequestedRevision()))
             %>"><span id="raw"></span>Raw</a></li>
 	<li><a href="<%= context + Prefix.DOWNLOAD_P + cfg.getUriEncodedPath() +
-            (cfg.getRequestedRevision().length() == 0 ? "" : "?" +
+            (cfg.getRequestedRevision().isEmpty() ? "" : "?" +
             QueryParameters.REVISION_PARAM_EQ + Util.uriEncode(cfg.getRequestedRevision()))
             %>"><span id="download"></span>Download</a></li>
 	<%
diff --git a/opengrok-web/src/test/java/org/opengrok/web/DirectoryListingTest.java b/opengrok-web/src/test/java/org/opengrok/web/DirectoryListingTest.java
index 7b343f077e2..a2978233634 100644
--- a/opengrok-web/src/test/java/org/opengrok/web/DirectoryListingTest.java
+++ b/opengrok-web/src/test/java/org/opengrok/web/DirectoryListingTest.java
@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2017, Chris Fraire <cfraire@me.com>.
  */
 package org.opengrok.web;
@@ -43,6 +43,7 @@
 
 import org.jetbrains.annotations.Nullable;
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -205,6 +206,12 @@ public int compareTo(FileEntry fe) {
         }
     }
 
+    @BeforeAll
+    static void setUpClass() {
+        RuntimeEnvironment env = RuntimeEnvironment.getInstance();
+        env.setHistoryEnabled(true);
+    }
+
     /**
      * Set up the test environment with repositories.
      */
diff --git a/opengrok-web/src/test/java/org/opengrok/web/PageConfigTest.java b/opengrok-web/src/test/java/org/opengrok/web/PageConfigTest.java
index 131aa5a9dfd..8b4eaba42f4 100644
--- a/opengrok-web/src/test/java/org/opengrok/web/PageConfigTest.java
+++ b/opengrok-web/src/test/java/org/opengrok/web/PageConfigTest.java
@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2020, Chris Fraire <cfraire@me.com>.
  */
 package org.opengrok.web;
@@ -75,9 +75,12 @@ class PageConfigTest {
 
     @BeforeAll
     public static void setUpClass() throws Exception {
+        RuntimeEnvironment env = RuntimeEnvironment.getInstance();
+        env.setHistoryEnabled(true);
+
         repository = new TestRepository();
         repository.create(PageConfigTest.class.getResource("/repositories"));
-        RuntimeEnvironment.getInstance().setRepositories(repository.getSourceRoot());
+        env.setRepositories(repository.getSourceRoot());
     }
 
     @AfterAll