diff --git a/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java b/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java
index eb62ffbc2..2f98d74a9 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java
@@ -977,8 +977,8 @@ class BuildHandler implements Runnable {
                     // reply will be sent in plaintext in a OTBRM, see below
                     reply = null;
                 } else {
-                    // TODO short build record
-                    reply = null;
+                    // short build record
+                    reply = BuildResponseRecord.createShort(_context, response, req.getChaChaReplyKey(), req.getChaChaReplyAD(), props);
                 }
             } else {
                 reply = BuildResponseRecord.create(_context, response, req.getChaChaReplyKey(), req.getChaChaReplyAD(), props);