diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 8d4d6067909..4f1952771a8 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -146,6 +146,9 @@ Bug Fixes
 
 * SOLR-13351: Workaround for VELOCITY-908 (Kevin Risden)
 
+ * SOLR-13349: High CPU usage in Solr due to Java 8 bug (Erick Erickson)
+
+
 Improvements
 ----------------------
 
diff --git a/solr/core/src/java/org/apache/solr/update/CommitTracker.java b/solr/core/src/java/org/apache/solr/update/CommitTracker.java
index 55b2287f851..975f166452f 100644
--- a/solr/core/src/java/org/apache/solr/update/CommitTracker.java
+++ b/solr/core/src/java/org/apache/solr/update/CommitTracker.java
@@ -59,7 +59,7 @@ public final class CommitTracker implements Runnable {
   private long tLogFileSizeUpperBound;
   
   private final ScheduledExecutorService scheduler = 
-      Executors.newScheduledThreadPool(0, new DefaultSolrThreadFactory("commitScheduler"));
+      Executors.newScheduledThreadPool(1, new DefaultSolrThreadFactory("commitScheduler"));
   private ScheduledFuture pending;
   
   // state