diff --git a/Changes b/Changes
index 343dbcc21..c91a5bd50 100644
--- a/Changes
+++ b/Changes
@@ -2535,3 +2535,4 @@ seen. gmtime warning still there
   fixed things (like kick a +h if you are +h) because older servers will still block
   the kick. You will receive a 'You cannot kick channel' message from every older
   server so you'll at least be notified ;p.
+- Don't allow remote pongs if unregistered.
diff --git a/src/modules/m_pingpong.c b/src/modules/m_pingpong.c
index f1bc44b18..3ae899161 100644
--- a/src/modules/m_pingpong.c
+++ b/src/modules/m_pingpong.c
@@ -224,6 +224,12 @@ DLLFUNC int m_pong(aClient *cptr, aClient *sptr, int parc, char *parv[])
 
 	if (!BadPtr(destination) && mycmp(destination, me.name) != 0)
 	{
+		/* No remote pongs if not registered */
+		if (MyConnect(sptr) && IsUnknown(sptr))
+		{
+			sendto_one(sptr, err_str(ERR_NOSUCHSERVER), me.name, parv[0], destination);
+			return 0;
+		}
 		if ((acptr = find_client(destination, NULL)) ||
 		    (acptr = find_server_quick(destination)))
 		{