diff --git a/src/sbbs3/mailsrvr.c b/src/sbbs3/mailsrvr.c
index e11a50f6c70272219a144b31e1b8dd93d7d7a0fb..b487e0f2464a7a8863beed0a4938915cec95e6d4 100644
--- a/src/sbbs3/mailsrvr.c
+++ b/src/sbbs3/mailsrvr.c
@@ -2014,6 +2014,9 @@ static void sendmail_thread(void* arg)
 		smb_rewind(smb.sid_fp);
 		for(offset=0;offset<total_msgs;offset++) {
 
+			if(server_socket==INVALID_SOCKET)	/* server stopped */
+				break;
+
 			if(active_sendmail!=0) {
 				active_sendmail=0;
 				update_clients();