diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index 92b5aba183a..6256c3001df 100644
--- a/code/modules/client/client procs.dm	
+++ b/code/modules/client/client procs.dm	
@@ -130,7 +130,7 @@ var/next_external_rsc = 0
 	if(holder)
 		add_admin_verbs()
 		admin_memo_show()
-		if(config.comms_key == "default_pwd" || length(config.comms_key) <= 6) //It's the default value or less than 6 characters long, warn badmins
+		if(config.comms_key == "default_pwd" || length(config.comms_key) <= 6 && !config.comms_enabled) //It's the default value or less than 6 characters long, but it somehow didn't disable comms.
 			src << "<span class='danger'>The server's API key is either too short or is the default value! Consider changing it immediately!</span>"
 
 	log_client_to_db()