diff --git a/main/src/main/scala/sbt/internal/TaskProgress.scala b/main/src/main/scala/sbt/internal/TaskProgress.scala
index c45878ecc..1f89eaf80 100644
--- a/main/src/main/scala/sbt/internal/TaskProgress.scala
+++ b/main/src/main/scala/sbt/internal/TaskProgress.scala
@@ -9,6 +9,7 @@ package sbt
 package internal
 
 import java.util.concurrent.atomic.{ AtomicBoolean, AtomicInteger, AtomicReference }
+import java.util.concurrent.{ LinkedBlockingQueue, TimeUnit }
 
 import sbt.internal.util._
 import sbt.util.Level
@@ -31,6 +32,7 @@ private[sbt] final class TaskProgress(log: ManagedLogger)
       with AutoCloseable {
     private[this] val isClosed = new AtomicBoolean(false)
     private[this] val firstTime = new AtomicBoolean(true)
+    private[this] val tasks = new LinkedBlockingQueue[Task[_]]
     setDaemon(true)
     start()
     @tailrec override def run(): Unit = {
@@ -40,12 +42,26 @@ private[sbt] final class TaskProgress(log: ManagedLogger)
           val duration =
             if (firstTime.compareAndSet(true, activeExceedingThreshold.nonEmpty)) threshold
             else sleepDuration
-          Thread.sleep(duration.toMillis)
-        } catch { case _: InterruptedException => isClosed.set(true) }
+          val limit = duration.fromNow
+          while (Deadline.now < limit) {
+            var task = tasks.poll((limit - Deadline.now).toMillis, TimeUnit.MILLISECONDS)
+            while (task != null) {
+              if (containsSkipTasks(Vector(task)) || lastTaskCount.get == 0) report()
+              task = tasks.poll
+            }
+          }
+        } catch {
+          case _: InterruptedException =>
+            isClosed.set(true)
+            // One last report after close in case the last one hadn't gone through yet.
+            report()
+        }
         run()
       }
     }
 
+    def addTask(task: Task[_]): Unit = tasks.put(task)
+
     override def close(): Unit = {
       isClosed.set(true)
       interrupt()
@@ -56,7 +72,10 @@ private[sbt] final class TaskProgress(log: ManagedLogger)
 
   override def beforeWork(task: Task[_]): Unit = {
     super.beforeWork(task)
-    if (containsSkipTasks(Vector(task)) || lastTaskCount.get == 0) report()
+    currentProgressThread.get match {
+      case Some(t) => t.addTask(task)
+      case _       => maybeStartThread()
+    }
   }
   override def afterReady(task: Task[_]): Unit = ()
 
@@ -128,6 +147,16 @@ private[sbt] final class TaskProgress(log: ManagedLogger)
     }
   }
 
-  private[this] def containsSkipTasks(tasks: Vector[Task[_]]): Boolean =
-    tasks.map(taskName).exists(n => skipReportTasks.exists(m => m == n || n.endsWith("/ " + m)))
+  private[this] def containsSkipTasks(tasks: Vector[Task[_]]): Boolean = {
+    tasks.map(taskName).exists { n =>
+      val shortName = n.lastIndexOf('/') match {
+        case -1 => n
+        case i =>
+          var j = i + 1
+          while (n(j) == ' ') j += 1
+          n.substring(j)
+      }
+      skipReportTasks.contains(shortName)
+    }
+  }
 }