diff --git a/akka-core/src/main/scala/remote/RemoteServer.scala b/akka-core/src/main/scala/remote/RemoteServer.scala
index c329dd6be3..06fdeae34c 100644
--- a/akka-core/src/main/scala/remote/RemoteServer.scala
+++ b/akka-core/src/main/scala/remote/RemoteServer.scala
@@ -130,11 +130,7 @@ object RemoteServer {
   }
 
   private def actorsFor(remoteServerAddress: RemoteServer.Address): RemoteActorSet = {
-    remoteActorSets.get(remoteServerAddress).getOrElse {
-      val remoteActorSet = new RemoteActorSet
-      remoteActorSets.put(remoteServerAddress, remoteActorSet)
-      remoteActorSet
-    }
+    remoteActorSets.getOrElseUpdate(remoteServerAddress,new RemoteActorSet)
   }
 }