diff --git a/Changes b/Changes
index 7cfdd1a27..c607f66c8 100644
--- a/Changes
+++ b/Changes
@@ -349,3 +349,4 @@
 - Added french docs, translated by Kolibot & Babass.
 - Changed some stuff to use the release version of MS libraries.
 - Updated installer for msvcr70.dll
+- Fixed prefix bug caused by previous 'fix'/behavior change. Reported by aquanight (#0002067).
diff --git a/src/modules/m_message.c b/src/modules/m_message.c
index 9fccec8c5..73c797d6c 100644
--- a/src/modules/m_message.c
+++ b/src/modules/m_message.c
@@ -373,6 +373,9 @@ DLLFUNC int m_message(aClient *cptr, aClient *sptr, int parc, char *parv[], int
 						abort();
 					strlcpy(pfixchan+1, p2, sizeof(pfixchan)-1);
 					nick = pfixchan;
+				} else {
+					strlcpy(pfixchan, p2, sizeof(pfixchan));
+					nick = pfixchan;
 				}
 			}