diff --git a/extensions/chm_regmsg.c b/extensions/chm_regmsg.c
index 97c851ff..d86d279e 100644
--- a/extensions/chm_regmsg.c
+++ b/extensions/chm_regmsg.c
@@ -57,6 +57,10 @@ chm_regmsg_process(void *data_)
 	if (data->approved)
 		return;
 
+	/* mode is unset, accept */
+	if (!(data->chptr->mode.mode & mode_regmsg))
+		return;
+
 	/* user is identified, accept */
 	if (!EmptyString(data->source_p->user->suser))
 		return;