diff --git a/src/ttynvt.c b/src/ttynvt.c
index f5569a6..dc74375 100644
--- a/src/ttynvt.c
+++ b/src/ttynvt.c
@@ -824,8 +824,12 @@ ttynvt_ioctl(fuse_req_t req, int cmd, void *arg,
         goto do_tcset;
       do_tcset:
         /* BEWARE of termios/termios2 buf structure difference! */
-        byte4 = htonl(baud);
-        telnet_rfc2217_cfg(tty->tn, TNS_SET_BAUDRATE, &byte4, 4);
+
+        if (baud != 0)
+        {
+            byte4 = htonl(baud);
+            telnet_rfc2217_cfg(tty->tn, TNS_SET_BAUDRATE, &byte4, 4);
+        }
 
         byte = _tio_csize(tio);
         telnet_rfc2217_cfg(tty->tn, TNS_SET_DATASIZE, &byte, 1);