diff --git a/src/sbbs3/zmodem.c b/src/sbbs3/zmodem.c
index 7027578765b219c081b7f15ba4040fbc94789e58..3d000ebdc40fdd8acfa5d835531881f75b197107 100644
--- a/src/sbbs3/zmodem.c
+++ b/src/sbbs3/zmodem.c
@@ -1291,7 +1291,7 @@ int zmodem_recv_header_and_check(zmodem_t* zm)
 	while(is_connected(zm) && !is_cancelled(zm)) {
 		type = zmodem_recv_header_raw(zm,TRUE);		
 
-		if(type != INVHDR && (type&BADSUBPKT) == 0) {
+		if(type != INVHDR && ((type&BADSUBPKT) == 0 || type==TIMEOUT)) {
 			break;
 		}