diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
index d7b9db2c9f0..0ff998c35fd 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
@@ -246,6 +246,7 @@ private HttpClient createHttpClient(Builder builder) {
         && builder.keyStoreReloadIntervalSecs > 0) {
       scanner = new KeyStoreScanner(sslContextFactory);
       try {
+        scanner.setScanInterval((int) Math.min(builder.keyStoreReloadIntervalSecs, Integer.MAX_VALUE));
         scanner.start();
         if (log.isDebugEnabled()) {
           log.debug("Key Store Scanner started");
@@ -1093,7 +1094,7 @@ public Http2SolrClient build() {
       if (keyStoreReloadIntervalSecs != null
           && keyStoreReloadIntervalSecs > 0
           && this.httpClient != null) {
-        log.warn("keyStoreReloadInterval can't be set when using external httpClient");
+        log.warn("keyStoreReloadIntervalSecs can't be set when using external httpClient");
         keyStoreReloadIntervalSecs = null;
       } else if (keyStoreReloadIntervalSecs == null
           && this.httpClient == null