diff --git a/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java b/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java
index a686278e3a07fed2a8b2f65e76f11a6071c024e0..75743811980a6805268ae9154ca0f12bcd5e9c2d 100644
--- a/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java
+++ b/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java
@@ -154,7 +154,7 @@ class InboundMessageDistributor implements GarlicMessageReceiver.CloveReceiver {
                         _log.error("Dropping DSM w/ reply token down a expl. tunnel: " + msg);
                         return;
                     }
-                    if (dsm.getEntry().getType() == DatabaseEntry.KEY_TYPE_LEASESET)
+                    if (dsm.getEntry().isLeaseSet())
                         ((LeaseSet)dsm.getEntry()).setReceivedAsReply();
                     break;
 
@@ -249,7 +249,7 @@ class InboundMessageDistributor implements GarlicMessageReceiver.CloveReceiver {
                         dsm.setReplyTunnel(null);
                         dsm.setReplyGateway(null);
 
-                            if (dsm.getEntry().getType() == DatabaseEntry.KEY_TYPE_LEASESET) {
+                            if (dsm.getEntry().isLeaseSet()) {
                                     // Case 1:
                                     // store of our own LS.
                                     // This is almost certainly a response to a FloodfillVerifyStoreJob search.