diff --git a/akka-remote/src/main/scala/akka/remote/artery/TestStage.scala b/akka-remote/src/main/scala/akka/remote/artery/TestStage.scala
index 9b5fcab931..788fa18400 100644
--- a/akka-remote/src/main/scala/akka/remote/artery/TestStage.scala
+++ b/akka-remote/src/main/scala/akka/remote/artery/TestStage.scala
@@ -5,11 +5,10 @@
 package akka.remote.artery
 
 import java.util.concurrent.atomic.AtomicReference
-
 import scala.annotation.tailrec
-
 import akka.actor.Address
 import akka.event.Logging
+import akka.remote.artery.OutboundHandshake.HandshakeReq
 import akka.remote.transport.ThrottlerTransportAdapter.Direction
 import akka.stream.Attributes
 import akka.stream.FlowShape
@@ -173,11 +172,24 @@ private[remote] class InboundTestStage(inboundContext: InboundContext, state: Sh
                   push(out, env)
               case _ =>
                 // unknown, handshake not completed
-                if (state.anyBlackholePresent())
-                  log.debug(
-                    "inbound message [{}] before handshake completed, cannot check if remote is blackholed, letting through",
-                    Logging.messageClassName(env.message))
-                push(out, env)
+                if (state.anyBlackholePresent()) {
+                  env.message match {
+                    case _: HandshakeReq =>
+                      log.debug(
+                        "inbound message [{}] before handshake completed, cannot check if remote is blackholed, letting through",
+                        Logging.messageClassName(env.message))
+                      push(out, env) // let it through
+
+                    case anyOther =>
+                      log.debug(
+                        "dropping inbound message [{}] with UID [{}] because of blackhole",
+                        Logging.messageClassName(anyOther),
+                        env.originUid)
+                      pull(in) // drop message
+                  }
+                } else {
+                  push(out, env)
+                }
             }
         }
       }