diff --git a/core/src/avm2/globals/flash/net/Socket.as b/core/src/avm2/globals/flash/net/Socket.as
index 4899ed3cf..b00045f5a 100644
--- a/core/src/avm2/globals/flash/net/Socket.as
+++ b/core/src/avm2/globals/flash/net/Socket.as
@@ -11,6 +11,7 @@ package flash.net {
     public class Socket extends EventDispatcher implements IDataOutput, IDataInput {
 
         public function Socket(host:String = null, port:int = 0) {
+            this.timeout = 20000;
             if (host != null) {
                 this.connect(host, port);
             }
diff --git a/core/src/avm2/object/socket_object.rs b/core/src/avm2/object/socket_object.rs
index 38269a290..835b07b32 100644
--- a/core/src/avm2/object/socket_object.rs
+++ b/core/src/avm2/object/socket_object.rs
@@ -24,8 +24,7 @@ pub fn socket_allocator<'gc>(
             // Default endianness is Big.
             endian: Cell::new(Endian::Big),
             object_encoding: Cell::new(ObjectEncoding::Amf3),
-            // Default is 20_000 milliseconds or 20 seconds.
-            timeout: Cell::new(20000),
+            timeout: Cell::new(0),
             handle: Cell::new(None),
             read_buffer: RefCell::new(vec![]),
             write_buffer: RefCell::new(vec![]),