diff --git a/YSFGateway/WiresX.cpp b/YSFGateway/WiresX.cpp
index b49f77b..53e9aa7 100644
--- a/YSFGateway/WiresX.cpp
+++ b/YSFGateway/WiresX.cpp
@@ -376,8 +376,11 @@ WX_STATUS CWiresX::processConnect(const unsigned char* source, const unsigned ch
 
 	m_reflector = m_reflectors.findById(id);
 	if (m_reflector == nullptr) {
+		if(source != nullptr)
+			processDisconnect(source);
 		sendConnectFailedReply();
-		return WX_STATUS::NONE;
+		// Keep state on Radio matched with YSFGateway
+		return WX_STATUS::DISCONNECT;
 	}
 
 	m_status = WXSI_STATUS::CONNECT;