diff --git a/main/src/main/scala/sbt/MainLoop.scala b/main/src/main/scala/sbt/MainLoop.scala
index 4b293b550..cbee12e42 100644
--- a/main/src/main/scala/sbt/MainLoop.scala
+++ b/main/src/main/scala/sbt/MainLoop.scala
@@ -239,7 +239,11 @@ object MainLoop {
         )
 
         val cmdProgressState =
-          getOrSet(progressState, sbt.Keys.currentCommandProgress, _.get(Keys.commandProgress))
+          getOrSet(
+            progressState,
+            sbt.Keys.currentCommandProgress,
+            _.getOpt(Keys.commandProgress).getOrElse(Seq())
+          )
 
         exchange.setState(cmdProgressState)
         exchange.setExec(Some(exec))