diff --git a/main/src/main/scala/sbt/Main.scala b/main/src/main/scala/sbt/Main.scala
index f41a26cec..2f87ff5bc 100644
--- a/main/src/main/scala/sbt/Main.scala
+++ b/main/src/main/scala/sbt/Main.scala
@@ -1088,12 +1088,20 @@ object BuiltinCommands {
         .getOpt(Keys.minForcegcInterval)
         .getOrElse(GCUtil.defaultMinForcegcInterval)
       val exec: Exec = getExec(s1, minGCInterval)
+      val isInteractive = exec.source match {
+        case Some(src) if src.channelName.startsWith("network") =>
+          exchange.channelForName(src.channelName) match {
+            case Some(nc: NetworkChannel) => nc.isInteractive
+            case _                        => true
+          }
+        case _ => true
+      }
       val newState = s1
         .copy(
           onFailure = Some(Exec(Shell, None)),
           remainingCommands = exec +: Exec(Shell, None) +: s1.remainingCommands
         )
-        .setInteractive(true)
+        .setInteractive(isInteractive)
       val res =
         if (exec.commandLine.trim.isEmpty) newState
         else newState.clearGlobalLog
diff --git a/sbt-app/src/sbt-test/actions/streams-trace-level/build.sbt b/sbt-app/src/sbt-test/actions/streams-trace-level/build.sbt
new file mode 100644
index 000000000..e2b32014e
--- /dev/null
+++ b/sbt-app/src/sbt-test/actions/streams-trace-level/build.sbt
@@ -0,0 +1,11 @@
+lazy val helloWithoutStreams = taskKey[Unit]("")
+lazy val helloWithStreams = taskKey[Unit]("")
+
+helloWithoutStreams := {
+  throw new RuntimeException("boom without streams!")
+}
+
+helloWithStreams := {
+  val log = streams.value.log
+  throw new RuntimeException("boom with streams!")
+}
diff --git a/sbt-app/src/sbt-test/actions/streams-trace-level/test b/sbt-app/src/sbt-test/actions/streams-trace-level/test
new file mode 100644
index 000000000..92bc6373f
--- /dev/null
+++ b/sbt-app/src/sbt-test/actions/streams-trace-level/test
@@ -0,0 +1,2 @@
+-> helloWithoutStreams
+-> helloWithStreams