diff --git a/DGIdGateway/YSFNetwork.cpp b/DGIdGateway/YSFNetwork.cpp
index acac223..eedfac8 100644
--- a/DGIdGateway/YSFNetwork.cpp
+++ b/DGIdGateway/YSFNetwork.cpp
@@ -177,6 +177,13 @@ void CYSFNetwork::clock(unsigned int ms)
 	if (!CUDPSocket::match(addr, m_addr))
 		return;
 
+	if (m_debug)
+		CUtils::dump(1U, "YSF Network Data Received", buffer, length);
+
+	// Throw away any options messages
+	if (::memcmp(buffer, "YSFO", 4U) == 0)
+		return;
+
 	if (::memcmp(buffer, "YSFP", 4U) == 0 && !m_linked) {
 		if (strcmp(m_name.c_str(),"MMDVM")== 0)
 			LogMessage("Link successful to %s", m_name.c_str());
@@ -189,9 +196,6 @@ void CYSFNetwork::clock(unsigned int ms)
 			m_socket.write(m_options, 50U, m_addr, m_addrLen);
 	}
 
-	if (m_debug)
-		CUtils::dump(1U, "YSF Network Data Received", buffer, length);
-
 	unsigned char len = length;
 	m_buffer.addData(&len, 1U);