diff --git a/src/sbbs3/logout.cpp b/src/sbbs3/logout.cpp
index 116ecf8d607de1d54006c84de6f892268576f396..5b509115daa706750edfb3418c7ef7b5bbe9b624 100644
--- a/src/sbbs3/logout.cpp
+++ b/src/sbbs3/logout.cpp
@@ -86,12 +86,15 @@ void sbbs_t::logout()
 
 	if(!online) {		/* NOT re-login */
 
+#if 0	/* too soon, handled in node_thread */
 		getnodedat(cfg.node_num,&thisnode,1);
 		thisnode.status=NODE_WFC;
 		thisnode.misc&=~(NODE_INTR|NODE_MSGW|NODE_NMSG
 			|NODE_UDAT|NODE_POFF|NODE_AOFF|NODE_EXT);
 		putnodedat(cfg.node_num,&thisnode);
-	#if 0	/* beep? */ 
+#endif
+
+#if 0	/* beep? */ 
 		if(sys_status&SS_SYSALERT) {
 			mswait(500);
 			offhook();
@@ -102,7 +105,7 @@ void sbbs_t::logout()
 				nosound();
 				mswait(200); }
 			lkbrd(0); }
-	#endif
+#endif
 		sys_status&=~SS_SYSALERT;
 		if(cfg.sys_logout[0])		/* execute system logout event */
 			external(cmdstr(cfg.sys_logout,nulstr,nulstr,NULL),EX_OUTL|EX_OFFLINE);