diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/RepublishLeaseSetJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/RepublishLeaseSetJob.java
index 718cc31bbe..04879b04ad 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/RepublishLeaseSetJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/RepublishLeaseSetJob.java
@@ -44,7 +44,7 @@ public void runJob() {
         
         try {
             if (getContext().clientManager().isLocal(_dest)) {
-                LeaseSet ls = getContext().clientNetDb(_dest).lookupLeaseSetLocally(_dest);
+                LeaseSet ls = _facade.lookupLeaseSetLocally(_dest);
                 if (ls != null) {
                     if (!ls.isCurrent(Router.CLOCK_FUDGE_FACTOR)) {
                         if (_log.shouldLog(Log.WARN))
@@ -101,12 +101,7 @@ public OnRepublishFailure(LeaseSet ls) {
 
         public void runJob() {
             // Don't requeue if there's a newer LS, KNDF will have already done that
-            LeaseSet ls = null;
-            if (_dest != null)
-                ls = getContext().clientNetDb(_dest).lookupLeaseSetLocally(_ls.getHash());
-            else
-                getContext().netDb().lookupLeaseSetLocally(_ls.getHash());
-                // ^ _dest should never be null here, right? So maybe instead we return immediately?
+            LeaseSet ls = _facade.lookupLeaseSetLocally(_ls.getHash());
             if (ls != null && ls.getEarliestLeaseDate() == _ls.getEarliestLeaseDate()) {
                 requeueRepublish();
             } else {