diff --git a/src/sbbs3/mailsrvr.c b/src/sbbs3/mailsrvr.c
index 31d6dccc9dbfec0ff62ff0b923ae54d388fa2832..87d32ca42d9633a85cadc6fa6c4641f891cb14d7 100644
--- a/src/sbbs3/mailsrvr.c
+++ b/src/sbbs3/mailsrvr.c
@@ -4689,23 +4689,11 @@ static void smtp_thread(void* arg)
 			sockprintf(socket, -1, "220 Ready to start TLS");
 			if (cryptSetAttribute(session, CRYPT_SESSINFO_ACTIVE, 1) != CRYPT_OK) {
 				lprintf(LOG_ERR, "%04d !SMTP Unable to set session active", socket);
-				cryptDestroySession(session);
-				mail_close_socket(socket);
-				thread_down();
-				protected_uint32_adjust(&active_clients, -1);
-				update_clients();
-				free(mailproc_to_match);
 				break;
 			}
 			if (startup->max_inactivity) {
 				if (cryptSetAttribute(session, CRYPT_OPTION_NET_READTIMEOUT, startup->max_inactivity) != CRYPT_OK) {
 					lprintf(LOG_ERR, "%04d !SMTP Unable to set max inactivity", socket);
-					cryptDestroySession(session);
-					mail_close_socket(socket);
-					thread_down();
-					protected_uint32_adjust(&active_clients, -1);
-					update_clients();
-					free(mailproc_to_match);
 					break;
 				}
 			}