--- lbbs/src/article_del.c	2025/06/15 05:09:19	1.3
+++ lbbs/src/article_del.c	2025/06/21 02:15:18	1.5
@@ -16,8 +16,8 @@
 
 #include "article_del.h"
 #include "database.h"
-#include "log.h"
 #include "io.h"
+#include "log.h"
 #include "screen.h"
 #include "user_priv.h"
 #include <ctype.h>
@@ -59,6 +59,9 @@ int article_del(const SECTION_LIST *p_se
 	{
 		switch (toupper(ch))
 		{
+		case KEY_NULL:
+		case KEY_TIMEOUT:
+			goto cleanup;
 		case CR:
 			igetch_reset();
 		case KEY_ESC:
@@ -73,6 +76,11 @@ int article_del(const SECTION_LIST *p_se
 		break;
 	}
 
+	if (SYS_server_exit) // Do not save data on shutdown
+	{
+		goto cleanup;
+	}
+
 	db = db_open();
 	if (db == NULL)
 	{