diff --git a/router/java/src/net/i2p/router/message/OutboundClientMessageJobHelper.java b/router/java/src/net/i2p/router/message/OutboundClientMessageJobHelper.java
index ac462bcfce..0be6229041 100644
--- a/router/java/src/net/i2p/router/message/OutboundClientMessageJobHelper.java
+++ b/router/java/src/net/i2p/router/message/OutboundClientMessageJobHelper.java
@@ -104,9 +104,11 @@ static GarlicMessage createGarlicMessage(RouterContext ctx, long replyToken, lon
      * @param dataClove may be null for ECIES-layer ack
      * @param tagsToSendOverride if > 0, use this instead of skm's default
      * @param lowTagsOverride if > 0, use this instead of skm's default
-     * @param wrappedKey non-null with null data,
-     *                   output parameter that will be filled with the SessionKey used
-     * @param wrappedTags output parameter that will be filled with the sessionTags used
+     * @param wrappedKey for ElGamal, non-null with null data,
+     *                   output parameter that will be filled with the SessionKey used,
+     *                   may be null for ECIES
+     * @param wrappedTags for ElGamal, output parameter that will be filled with the sessionTags used,
+     *                    may be null for ECIES
      * @param replyTunnel non-null if requireAck is true or bundledReplyLeaseSet is non-null
      * @param requireAck if true, bundle replyToken in an ack clove
      * @param bundledReplyLeaseSet may be null; if non-null, put it in a clove
diff --git a/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java b/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java
index f9a6446ec3..95c5dba88b 100644
--- a/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java
+++ b/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java
@@ -699,8 +699,15 @@ private void send() {
             clove = null;
         }
 
-        SessionKey sessKey = new SessionKey();
-        Set<SessionTag> tags = new HashSet<SessionTag>();
+        SessionKey sessKey;
+        Set<SessionTag> tags;
+        if (_encryptionKey.getType() == EncType.ECIES_X25519) {
+            sessKey = null;
+            tags = null;
+        } else {
+            sessKey = new SessionKey();
+            tags = new HashSet<SessionTag>();
+        }
 
         // Per-message flag > 0 overrides per-session option
         int tagsToSend = SendMessageOptions.getTagsToSend(sendFlags);