diff --git a/Drone/client.py b/Drone/client.py
index 9fb5081..9026920 100644
--- a/Drone/client.py
+++ b/Drone/client.py
@@ -98,7 +98,7 @@ 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)
+                messaging.set_keepalive(self.client_socket)
                 self.client_socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
                 self.client_socket.connect((self.config.server_host, self.config.server_port))
             except socket.error as error:
diff --git a/Server/server.py b/Server/server.py
index 1ad1fc5..09a9976 100644
--- a/Server/server.py
+++ b/Server/server.py
@@ -46,7 +46,7 @@ class Server(messaging.Singleton):
         self.sel = selectors.DefaultSelector()
         self.server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self.server_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        self.server_socket.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
+        messaging.set_keepalive(self.server_socket)
         self.server_socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
 
         self.host = socket.gethostname()