diff --git a/llarp/service/endpoint.cpp b/llarp/service/endpoint.cpp
index 60c6688f8..9daf9c202 100644
--- a/llarp/service/endpoint.cpp
+++ b/llarp/service/endpoint.cpp
@@ -1826,6 +1826,14 @@ namespace llarp
     {
       if(markedBad)
         return false;
+      if(path::Builder::ShouldBuildMore(now))
+        return true;
+      return !ReadyToSend();
+    }
+
+    bool
+    Endpoint::ShouldBuildMore(llarp_time_t now) const
+    {
       bool should = path::Builder::ShouldBuildMore(now);
       // determine newest intro
       Introduction intro;
diff --git a/llarp/service/endpoint.hpp b/llarp/service/endpoint.hpp
index 342417120..f03443523 100644
--- a/llarp/service/endpoint.hpp
+++ b/llarp/service/endpoint.hpp
@@ -261,6 +261,9 @@ namespace llarp
       static void
       HandlePathDead(void*);
 
+      bool
+      ShouldBuildMore(llarp_time_t now) const override;
+
       /// context needed to initiate an outbound hidden service session
       struct OutboundContext : public path::Builder, public SendContext
       {