diff --git a/akka-remote/src/main/scala/akka/remote/Endpoint.scala b/akka-remote/src/main/scala/akka/remote/Endpoint.scala
index 292b535c7f..c3ab140e2d 100644
--- a/akka-remote/src/main/scala/akka/remote/Endpoint.scala
+++ b/akka-remote/src/main/scala/akka/remote/Endpoint.scala
@@ -545,13 +545,10 @@ private[remote] class EndpointWriter(
       unstashAll()
       goto(Writing)
 
-    case Event(Send(msg, senderOption, recipient, _), _) ⇒
+    case _ =>
       stash()
       stay()
 
-    case _: StopReading ⇒
-      stash()
-      stay()
   }
 
   whenUnhandled {