diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 67fa35b..1c83e80 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,10 @@
 CHANGELOG
 ---------
 
+Unreleased
+:::::
+- Configure TCP socket to disable Nagle for SHDLC frame transmit
+
 1.0.2
 :::::
 - Fix version
diff --git a/sensirion_shdlc_driver/port.py b/sensirion_shdlc_driver/port.py
index 923cd42..67f9f87 100755
--- a/sensirion_shdlc_driver/port.py
+++ b/sensirion_shdlc_driver/port.py
@@ -373,6 +373,7 @@ def __init__(self, ip, port, socket_timeout=5.0, do_open=True):
         self._is_open = False
         self._lock = RLock()
         self._socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        self._socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
         self._socket.settimeout(self._socket_timeout)
         if do_open:
             self.open()