diff --git a/Changes b/Changes
index 98f4722fd..fabf6ed41 100644
--- a/Changes
+++ b/Changes
@@ -2474,3 +2474,5 @@
   always generating one.
 - Added missing Mod_Header to m_sasl.c
 - Remove old reference to networks/ directory from Windows installer
+- Disable sending of UHNAMES when HTM (High Traffic Mode) is ON,
+  suggested by driew (#3900).
diff --git a/src/modules/m_names.c b/src/modules/m_names.c
index 65450b74d..8bfc235aa 100644
--- a/src/modules/m_names.c
+++ b/src/modules/m_names.c
@@ -206,7 +206,7 @@ DLLFUNC CMD_FUNC(m_names)
 				buf[idx++] = '+';
 		}
 
-		if (!uhnames) {
+		if (lifesux || !uhnames) {
 			s = acptr->name;
 		} else {
 			strlcpy(nuhBuffer,