diff --git a/Common/RepeaterHandler.cpp b/Common/RepeaterHandler.cpp
index b100cf1..27aa600 100644
--- a/Common/RepeaterHandler.cpp
+++ b/Common/RepeaterHandler.cpp
@@ -1975,7 +1975,10 @@ void CRepeaterHandler::g2CommandHandler(const std::string& callsign, const std::
 		m_g2User = "CQCQCQ  ";
 
 		CRepeaterData* data = m_cache->findRepeater(m_g2Repeater);
-		m_irc->notifyRepeaterG2NatTraversal(m_g2Repeater);
+		if( data != NULL && data->getRepeater() == m_rptCallsign) {
+			// No point NAT traversal to ourselves
+			m_irc->notifyRepeaterG2NatTraversal(m_g2Repeater);
+		}
 
 		if (data == NULL) {
 			m_g2Status = G2_REPEATER;