diff --git a/src/cfg.c b/src/cfg.c
index a7867c4..d5de585 100644
--- a/src/cfg.c
+++ b/src/cfg.c
@@ -61,7 +61,7 @@ cfg_init(void)
   strncpy(cfg.logname, LOGNAME, INTBUFSIZE);
 #endif
   strncpy(cfg.ttyport, DEFAULT_PORT, INTBUFSIZE);
-  cfg.ttyspeed = DEFAULT_SPEED;
+  cfg.ttyspeed = 0;
   strncpy(cfg.ttymode, DEFAULT_MODE, INTBUFSIZE);
 #ifdef TRXCTL
   cfg.trxcntl = TRX_ADDC;
diff --git a/src/tty.c b/src/tty.c
index cd2a869..09e3ffb 100644
--- a/src/tty.c
+++ b/src/tty.c
@@ -201,7 +201,7 @@ tty_transpeed(int speed)
   switch (speed)
   {
   case 0:
-    tspeed = B0;
+    tspeed = DEFAULT_BSPEED;
     break;
 #if defined(B50)
   case 50:
@@ -312,8 +312,8 @@ tty_transpeed(int speed)
     break;
 #endif
   default:
-    tspeed = DEFAULT_BSPEED;
-    break;
+    logw(2, "unsupported baudrate (%d)", speed);
+    exit (-1);
   }
   return tspeed;
 }