diff --git a/llarp/service/outbound_context.cpp b/llarp/service/outbound_context.cpp
index 01fd6dcef..25003ddda 100644
--- a/llarp/service/outbound_context.cpp
+++ b/llarp/service/outbound_context.cpp
@@ -313,7 +313,10 @@ namespace llarp
         ++m_BuildFails;
         return false;
       }
-      return path::Builder::SelectHop(db, exclude, cur, hop, roles);
+      else if(hop == 0)
+        return path::Builder::SelectHop(db, prev, cur, hop, roles);
+      else
+        return path::Builder::SelectHop(db, exclude, cur, hop, roles);
     }
 
     bool