1 files changed, 3 insertions, 2 deletions
diff --git a/src/cli.c b/src/cli.c
index 273ba624b7..85f8957878 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -780,6 +780,7 @@ static int check_net_or_keyboard_input(socket_st* hd)
   fd_set rset;
   int err;
   struct timeval tv;
+  int prev_alrm = starttls_alarmed;
 
   do
     {
@@ -820,8 +821,8 @@ static int check_net_or_keyboard_input(socket_st* hd)
         return IN_KEYBOARD;
 #endif
     }
-  while(err == 0);
-  
+  while(err == 0 && prev_alrm == starttls_alarmed);
+
   return IN_NONE;
 }