diff --git a/router/java/src/net/i2p/router/tunnelmanager/TunnelBuilder.java b/router/java/src/net/i2p/router/tunnelmanager/TunnelBuilder.java
index 84a671df3faba3194ae4f6af3416def2d356cc82..b7b599f818913cf79d3ac3b9195b80b8f1bf50f7 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/TunnelBuilder.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/TunnelBuilder.java
@@ -307,6 +307,7 @@ class TunnelBuilder {
             if (prev != null) {
                 prev.setNextHop(peer);
                 prev.setNextHopInfo(cur);
+                prev.setNextHopId(cur.getTunnelId());
             } else {
                 first = cur;
             }
@@ -331,6 +332,7 @@ class TunnelBuilder {
                 cur = cur.getNextHopInfo();
             cur.setNextHop(last.getThisHop());
             cur.setNextHopInfo(last);
+            cur.setNextHopId(last.getTunnelId());
         }
         
         return first;
@@ -393,6 +395,7 @@ class TunnelBuilder {
             
             prev.setNextHop(peer);
             prev.setNextHopInfo(cur);
+            prev.setNextHopId(cur.getTunnelId());
             prev = cur;
         }