diff --git a/DExtraProtocolHandlerPool.cpp b/DExtraProtocolHandlerPool.cpp
index 0b77b56..c356858 100644
--- a/DExtraProtocolHandlerPool.cpp
+++ b/DExtraProtocolHandlerPool.cpp
@@ -43,6 +43,10 @@ CDExtraProtocolHandlerPool::~CDExtraProtocolHandlerPool()
 
 CDExtraProtocolHandler* CDExtraProtocolHandlerPool::getIncomingHandler()
 {
+	auto it = m_pool.find(m_basePort);
+	if(it != m_pool.end())
+		return it->second;
+		
 	return getHandler(m_basePort);
 }