diff --git a/main/src/main/scala/sbt/internal/CommandExchange.scala b/main/src/main/scala/sbt/internal/CommandExchange.scala
index 6ce1ce14e..fc78ecf82 100644
--- a/main/src/main/scala/sbt/internal/CommandExchange.scala
+++ b/main/src/main/scala/sbt/internal/CommandExchange.scala
@@ -153,7 +153,8 @@ private[sbt] final class CommandExchange {
 
   def run(s: State): State = run(s, s.get(autoStartServer).getOrElse(true))
   def run(s: State, autoStart: Boolean): State = {
-    if (autoStartServerSysProp && autoStart) runServer(s)
+    val startedByRemote = Terminal.startedByRemoteClient
+    if (autoStartServerSysProp && (autoStart || startedByRemote)) runServer(s)
     else s
   }
   private[sbt] def setState(s: State): Unit = lastState.set(s)