diff --git a/akka-actor/src/main/scala/akka/actor/ActorRegistry.scala b/akka-actor/src/main/scala/akka/actor/ActorRegistry.scala
index 9fb24a970e..702fb93a08 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRegistry.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRegistry.scala
@@ -35,10 +35,7 @@ private[actor] final class ActorRegistry private[actor] () extends ListenerManag
   /**
    * Finds the actor that has a specific address.
    */
-  def actorFor(address: String): Option[ActorRef] = {
-    if (actorsByAddress.containsKey(address)) Some(actorsByAddress.get(address))
-    else None
-  }
+  def actorFor(address: String): Option[ActorRef] = Option(actorsByAddress.get(address))
 
   /**
    * Finds the typed actors that have a specific address.