diff --git a/src/core/Akka/IO/TcpListener.cs b/src/core/Akka/IO/TcpListener.cs
index 494fed3fdbe..9407c1c153c 100644
--- a/src/core/Akka/IO/TcpListener.cs
+++ b/src/core/Akka/IO/TcpListener.cs
@@ -89,7 +89,7 @@ protected override bool Receive(object message)
             {
                 var saea = message as SocketAsyncEventArgs;
                 if (saea.SocketError == SocketError.Success)
-                    Context.ActorOf(Props.Create<TcpIncomingConnection>(_tcp, saea.AcceptSocket, _bind.Handler, _bind.Options, _bind.PullMode));
+                    Context.ActorOf(Props.Create<TcpIncomingConnection>(_tcp, saea.AcceptSocket, _bind.Handler, _bind.Options, _bind.PullMode).WithDeploy(Deploy.Local));
                 saea.AcceptSocket = null;
 
                 if (!_socket.AcceptAsync(saea))
diff --git a/src/core/Akka/IO/TcpManager.cs b/src/core/Akka/IO/TcpManager.cs
index a2c77e6d86d..f844648f466 100644
--- a/src/core/Akka/IO/TcpManager.cs
+++ b/src/core/Akka/IO/TcpManager.cs
@@ -76,14 +76,14 @@ protected override bool Receive(object message)
             if (c != null)
             {
                 var commander = Sender;
-                Context.ActorOf(Props.Create<TcpOutgoingConnection>(_tcp, commander, c));
+                Context.ActorOf(Props.Create<TcpOutgoingConnection>(_tcp, commander, c).WithDeploy(Deploy.Local));
                 return true;
             }
             var b = message as Bind;
             if (b != null)
             {
                 var commander = Sender;
-                Context.ActorOf(Props.Create<TcpListener>(_tcp, commander, b));
+                Context.ActorOf(Props.Create<TcpListener>(_tcp, commander, b).WithDeploy(Deploy.Local));
                 return true;
             }
             var dl = message as DeadLetter;
diff --git a/src/core/Akka/IO/UdpManager.cs b/src/core/Akka/IO/UdpManager.cs
index 46eef528531..7b91ab9f814 100644
--- a/src/core/Akka/IO/UdpManager.cs
+++ b/src/core/Akka/IO/UdpManager.cs
@@ -65,14 +65,14 @@ protected override bool Receive(object message)
             if (b != null)
             {
                 var commander = Sender;
-                Context.ActorOf(Props.Create(() => new UdpListener(_udp, commander, b)));
+                Context.ActorOf(Props.Create(() => new UdpListener(_udp, commander, b)).WithDeploy(Deploy.Local));
                 return true;
             }
             var s = message as Udp.SimpleSender;
             if (s != null)
             {
                 var commander = Sender;
-                Context.ActorOf(Props.Create(() => new UdpSender(_udp, commander, s.Options)));
+                Context.ActorOf(Props.Create(() => new UdpSender(_udp, commander, s.Options)).WithDeploy(Deploy.Local));
                 return true;
             }
             throw new ArgumentException($"The supplied message of type {message.GetType().Name} is invalid. Only Connect and Bind messages are supported. " +