diff --git a/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala b/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
index c28d15dd8..630b50ee3 100644
--- a/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
+++ b/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
@@ -672,8 +672,11 @@ class NetworkClient(
           catch { case _: InterruptedException => }
           if (exitClean.get) 0 else 1
         }
-        if (interactive) block()
-        else if (exit) 0
+        console.appendLog(Level.Info, "terminate the server with `shutdown`")
+        if (interactive) {
+          console.appendLog(Level.Info, "disconnect from the server with `exit`")
+          block()
+        } else if (exit) 0
         else {
           batchMode.set(true)
           val res = batchExecute(userCommands.toList)