diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp
index 5b0c6e847..9130c4354 100644
--- a/modules/protocol/inspircd20.cpp
+++ b/modules/protocol/inspircd20.cpp
@@ -875,6 +875,13 @@ class IRCDMessageMetadata : IRCDMessage
 					if (modes != params[2])
 						UplinkSocket::Message(Me) << "METADATA " << c->name << " mlock :" << modes;
 				}
+				else if ((do_topiclock) && (params[1] == "topiclock"))
+				{
+					bool mystate = c->ci->GetExt<bool>("TOPICLOCK");
+					bool serverstate = (params[2] == "1");
+					if (mystate != serverstate)
+						UplinkSocket::Message(Me) << "METADATA " << c->name << " topiclock :" << (mystate ? "1" : "");
+				}
 			}
 		}