diff --git a/exec/msgscancfg.js b/exec/msgscancfg.js
index bcd159eebe73568906c6589f8e21e22286d6a039..547002a6c0819452e568cdbe9bbf08940b322f32 100644
--- a/exec/msgscancfg.js
+++ b/exec/msgscancfg.js
@@ -6,7 +6,7 @@ require("sbbsdefs.js", "USER_EXPERT");
 
 const menufile = "maincfg";
 
-while(bbs.online) {
+while(bbs.online && !js.terminated) {
 	if(!(user.settings & USER_EXPERT))
 		bbs.menu(menufile);
 	bbs.nodesync();
@@ -40,5 +40,5 @@ while(bbs.online) {
 			console.print("\r\nMessage scan configuration and pointers saved.\r\n");
 			break;
 	}
-	exit();
+	break;
 }