diff --git a/akka-remote/src/main/scala/akka/remote/Endpoint.scala b/akka-remote/src/main/scala/akka/remote/Endpoint.scala
index ed9b220180..915c85e9e7 100644
--- a/akka-remote/src/main/scala/akka/remote/Endpoint.scala
+++ b/akka-remote/src/main/scala/akka/remote/Endpoint.scala
@@ -12,7 +12,7 @@ import akka.remote.transport.AssociationHandle._
 import akka.remote.transport.{ AkkaPduCodec, Transport, AssociationHandle }
 import akka.serialization.Serialization
 import akka.util.ByteString
-import scala.util.control.NonFatal
+import util.control.{ NoStackTrace, NonFatal }
 
 /**
  * Internal API
@@ -106,7 +106,7 @@ private[remote] object EndpointWriter {
   case object Writing extends State
 }
 
-private[remote] class EndpointException(msg: String, cause: Throwable) extends AkkaException(msg, cause) {
+private[remote] class EndpointException(msg: String, cause: Throwable) extends AkkaException(msg, cause) with NoStackTrace {
   def this(msg: String) = this(msg, null)
 }