diff --git a/Libraries/LibWebSocket/Impl/WebSocketImplSerenity.cpp b/Libraries/LibWebSocket/Impl/WebSocketImplSerenity.cpp
index 4f80c6dc08d..867bad492f3 100644
--- a/Libraries/LibWebSocket/Impl/WebSocketImplSerenity.cpp
+++ b/Libraries/LibWebSocket/Impl/WebSocketImplSerenity.cpp
@@ -47,13 +47,15 @@ void WebSocketImplSerenity::connect(ConnectionInfo const& connection_info)
         if (connection_info.is_secure()) {
             TLS::Options options;
             options.set_root_certificates_path(connection_info.root_certificates_path());
+            options.set_blocking(false);
 
             return TRY(Core::BufferedSocket<TLS::TLSv12>::create(
                 TRY(TLS::TLSv12::connect(host, connection_info.url().port_or_default(), move(options)))));
         }
 
-        return TRY(Core::BufferedTCPSocket::create(
-            TRY(Core::TCPSocket::connect(host, connection_info.url().port_or_default()))));
+        auto tcp_socket = TRY(Core::TCPSocket::connect(host, connection_info.url().port_or_default()));
+        TRY(tcp_socket->set_blocking(false));
+        return TRY(Core::BufferedTCPSocket::create(move(tcp_socket)));
     }();
 
     if (socket_result.is_error()) {
@@ -64,8 +66,6 @@ void WebSocketImplSerenity::connect(ConnectionInfo const& connection_info)
     }
 
     m_socket = socket_result.release_value();
-    MUST(m_socket->set_blocking(false));
-
     m_socket->on_ready_to_read = [this] {
         on_ready_to_read();
     };