diff --git a/router/java/src/net/i2p/router/client/ClientMessageEventListener.java b/router/java/src/net/i2p/router/client/ClientMessageEventListener.java
index 1ac851b338..b44a3a42ae 100644
--- a/router/java/src/net/i2p/router/client/ClientMessageEventListener.java
+++ b/router/java/src/net/i2p/router/client/ClientMessageEventListener.java
@@ -621,6 +621,8 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi
                         _runner.disconnectClient("Private/public crypto key mismatch in LS");
                         return;
                     }
+                    // just register new SPK, don't verify, unused
+                    _context.keyManager().registerKeys(dest, message.getSigningPrivateKey(), message.getPrivateKey());
                 } else {
                     // LS2
                     LeaseSet2 ls2 = (LeaseSet2) ls;
@@ -645,9 +647,9 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi
                             return;
                         }
                     }
+                    // just register new SPK, don't verify, unused
+                    _context.keyManager().registerKeys(dest, message.getSigningPrivateKey(), pks);
                 }
-                // just register new SPK, don't verify, unused
-                _context.keyManager().registerKeys(dest, message.getSigningPrivateKey(), message.getPrivateKey());
             } else if (message.getSigningPrivateKey() != null &&
                        !message.getSigningPrivateKey().equals(keys.getRevocationKey())) {
                 // just register new SPK, don't verify, unused