diff --git a/Drone/client.py b/Drone/client.py
index a38570a..fc8e952 100644
--- a/Drone/client.py
+++ b/Drone/client.py
@@ -119,6 +119,8 @@ class Client(object):
             try:
                 self.client_socket = socket.socket()
                 self.client_socket.settimeout(timeout)
+                self.client_socket.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
+                self.client_socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
                 self.client_socket.connect((self.server_host, self.server_port))
             except socket.error as error:
                 if isinstance(error, OSError):