diff --git a/llarp/service/endpoint.cpp b/llarp/service/endpoint.cpp
index 574295526..ee07f3ca9 100644
--- a/llarp/service/endpoint.cpp
+++ b/llarp/service/endpoint.cpp
@@ -1142,29 +1142,7 @@ namespace llarp
     Endpoint::OutboundContext::SwapIntros()
     {
       remoteIntro = m_NextIntro;
-      // prepare next intro
-      auto now = Now();
-      for(const auto& intro : currentIntroSet.I)
-      {
-        if(intro.ExpiresSoon(now))
-          continue;
-        if(m_BadIntros.find(intro) == m_BadIntros.end()
-           && remoteIntro.router == intro.router)
-        {
-          m_NextIntro = intro;
-          return;
-        }
-      }
-      for(const auto& intro : currentIntroSet.I)
-      {
-        if(intro.ExpiresSoon(now))
-          continue;
-        if(m_BadIntros.find(intro) == m_BadIntros.end())
-        {
-          m_NextIntro = intro;
-          return;
-        }
-      }
+      m_DataHandler->PutIntroFor(currentConvoTag, remoteIntro);
     }
 
     bool