diff --git a/akka-remote/src/main/scala/akka/remote/netty/Client.scala b/akka-remote/src/main/scala/akka/remote/netty/Client.scala
index cbd49fc202..3a7287d33a 100644
--- a/akka-remote/src/main/scala/akka/remote/netty/Client.scala
+++ b/akka-remote/src/main/scala/akka/remote/netty/Client.scala
@@ -147,12 +147,9 @@ private[akka] class ActiveRemoteClient private[akka] (
       b.setOption("tcpNoDelay", true)
       b.setOption("keepAlive", true)
       b.setOption("connectTimeoutMillis", settings.ConnectionTimeout.toMillis)
-      if (settings.ReceiveBufferSize.isDefined)
-        b.setOption("receiveBufferSize", settings.ReceiveBufferSize.get)
-      if (settings.SendBufferSize.isDefined)
-        b.setOption("sendBufferSize", settings.SendBufferSize.get)
-      if (settings.WriteBufferHighWaterMark.isDefined)
-        b.setOption("writeBufferHighWaterMark", settings.WriteBufferHighWaterMark.get)
+      settings.ReceiveBufferSize.foreach(sz ⇒ b.setOption("receiveBufferSize", sz))
+      settings.SendBufferSize.foreach(sz ⇒ b.setOption("sendBufferSize", sz))
+      settings.WriteBufferHighWaterMark.foreach(sz ⇒ b.setOption("writeBufferHighWaterMark", sz))
       settings.OutboundLocalAddress.foreach(s ⇒ b.setOption("localAddress", new InetSocketAddress(s, 0)))
       bootstrap = b
 
diff --git a/akka-remote/src/main/scala/akka/remote/netty/Server.scala b/akka-remote/src/main/scala/akka/remote/netty/Server.scala
index 170f7ebae1..f9cfcf2355 100644
--- a/akka-remote/src/main/scala/akka/remote/netty/Server.scala
+++ b/akka-remote/src/main/scala/akka/remote/netty/Server.scala
@@ -45,12 +45,9 @@ private[akka] class NettyRemoteServer(val netty: NettyRemoteTransport) {
     b.setOption("tcpNoDelay", true)
     b.setOption("child.keepAlive", true)
     b.setOption("reuseAddress", true)
-    if (settings.ReceiveBufferSize.isDefined)
-      b.setOption("receiveBufferSize", settings.ReceiveBufferSize.get)
-    if (settings.SendBufferSize.isDefined)
-      b.setOption("sendBufferSize", settings.SendBufferSize.get)
-    if (settings.WriteBufferHighWaterMark.isDefined)
-      b.setOption("writeBufferHighWaterMark", settings.WriteBufferHighWaterMark.get)
+    settings.ReceiveBufferSize.foreach(sz ⇒ b.setOption("receiveBufferSize", sz))
+    settings.SendBufferSize.foreach(sz ⇒ b.setOption("sendBufferSize", sz))
+    settings.WriteBufferHighWaterMark.foreach(sz ⇒ b.setOption("writeBufferHighWaterMark", sz))
     b
   }