diff --git a/src/autoapp/UI/ConnectDialog.cpp b/src/autoapp/UI/ConnectDialog.cpp
index 127e216..08b4f56 100644
--- a/src/autoapp/UI/ConnectDialog.cpp
+++ b/src/autoapp/UI/ConnectDialog.cpp
@@ -46,6 +46,8 @@ void ConnectDialog::onConnectButtonClicked()
 
     try
     {
+        tcpWrapper_.setKeepAliveOption(*socket, true);
+        tcpWrapper_.setNoDelayOption(*socket, true);
         tcpWrapper_.asyncConnect(*socket, ipAddress, 5277, std::bind(&ConnectDialog::connectHandler, this, std::placeholders::_1, ipAddress, socket));
     }
     catch(const boost::system::system_error& se)