diff --git a/akka-remote/src/main/scala/akka/remote/Remoting.scala b/akka-remote/src/main/scala/akka/remote/Remoting.scala
index 7da7256c00..80192694ec 100644
--- a/akka-remote/src/main/scala/akka/remote/Remoting.scala
+++ b/akka-remote/src/main/scala/akka/remote/Remoting.scala
@@ -488,8 +488,8 @@ private[remote] class EndpointManager(conf: Config, log: LoggingAdapter) extends
           if (timeOfRelease.isOverdue()) createAndRegisterWritingEndpoint(None) ! s
           else extendedSystem.deadLetters ! s
         case Some(Quarantined(uid, timeOfRelease)) ⇒
-          if (timeOfRelease.isOverdue()) createAndRegisterWritingEndpoint(Some(uid)) ! s
-          else createAndRegisterWritingEndpoint(None) ! s
+          if (timeOfRelease.isOverdue()) createAndRegisterWritingEndpoint(None) ! s
+          else createAndRegisterWritingEndpoint(Some(uid)) ! s
         case None ⇒
           createAndRegisterWritingEndpoint(None) ! s