diff --git a/default.theme b/default.theme
index 415a0b9e..29a45d96 100644
--- a/default.theme
+++ b/default.theme
@@ -47,7 +47,7 @@ abstracts = {
   ownnotice = "[%r$0-]%n ";
   ownnotice_target = "%K(%R$0-%K)";
   notice = "%K-%M$0-%K-%n ";
-  pubnotice_channel = "%K:%m$1";
+  pubnotice_channel = "%K:%m$0";
   pvtnotice_nick = "%K(%m$0-%K)";
   servernotice = "%g!$0-%n ";
 
diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c
index 4229faff..510ac4eb 100644
--- a/src/fe-common/irc/module-formats.c
+++ b/src/fe-common/irc/module-formats.c
@@ -124,8 +124,8 @@ FORMAT_REC fecommon_irc_formats[] = {
 	{ NULL, "Received messages", 0 },
 
 	{ "notice_server", "{servernotice $0}$1", 2, { 0, 0 } },
-	{ "notice_public", "{notice $0{pubnotice_channel $1}$2", 3, { 0, 0, 0 } },
-	{ "notice_public_ops", "{notice $0{pubnotice_channel @$1}$2", 3, { 0, 0, 0 } },
+	{ "notice_public", "{notice $0{pubnotice_channel $1}}$2", 3, { 0, 0, 0 } },
+	{ "notice_public_ops", "{notice $0{pubnotice_channel @$1}}$2", 3, { 0, 0, 0 } },
 	{ "notice_private", "{notice $0{pvtnotice_nick $1}}$2", 3, { 0, 0, 0 } },
 	{ "action_private", "{pvtaction $0}$2", 3, { 0, 0, 0 } },
 	{ "action_private_query", "{pvtaction_query $0}$2", 3, { 0, 0, 0 } },