diff --git a/src/sbbs3/atcodes.cpp b/src/sbbs3/atcodes.cpp
index 37fb5906daa8b2ff1a978a4b02a34f97bc557636..878f7520ef7a7b486ed3e6690897daf4784757b8 100644
--- a/src/sbbs3/atcodes.cpp
+++ b/src/sbbs3/atcodes.cpp
@@ -294,7 +294,7 @@ const char* sbbs_t::atcode(char* sp, char* str, size_t maxlen, long* pmode)
 		return(cfg.sys_name);
 
 	if(!strcmp(sp,"BAUD") || !strcmp(sp,"BPS")) {
-		safe_snprintf(str,maxlen,"%lu",cur_rate);
+		safe_snprintf(str,maxlen,"%lu",cur_output_rate ? cur_output_rate : cur_rate);
 		return(str);
 	}