diff --git a/main/src/main/scala/sbt/Main.scala b/main/src/main/scala/sbt/Main.scala
index 74e777de1..671cff4e8 100644
--- a/main/src/main/scala/sbt/Main.scala
+++ b/main/src/main/scala/sbt/Main.scala
@@ -131,9 +131,8 @@ private[sbt] object xMain:
               )
               .put(BasicKeys.detachStdio, detachStdio)
             val state = bootServerSocket match {
-              // todo: fix this
-              // case Some(l) => state0.put(Keys.bootServerSocket, l)
-              case _ => state0
+              case Some(l) => state0.put(Keys.bootServerSocket, l)
+              case _       => state0
             }
             try StandardMain.runManaged(state)
             finally bootServerSocket.foreach(_.close())