diff --git a/llarp/service/endpoint.cpp b/llarp/service/endpoint.cpp
index 04dcb99ed..fc03439c6 100644
--- a/llarp/service/endpoint.cpp
+++ b/llarp/service/endpoint.cpp
@@ -20,6 +20,7 @@
 #include <util/buffer.hpp>
 #include <util/meta/memfn.hpp>
 #include <hook/shell.hpp>
+#include <link/link_manager.hpp>
 
 #include <utility>
 
@@ -1107,7 +1108,6 @@ namespace llarp
       {
         epPump();
       }
-
       auto router = Router();
       // TODO: locking on this container
       for(const auto& item : m_state->m_RemoteSessions)
@@ -1125,7 +1125,8 @@ namespace llarp
         }
         m_state->m_SendQueue.clear();
       }
-      router->PumpLL();
+      UpstreamFlush(router);
+      router->linkManager().PumpLinks();
     }
 
     bool