diff --git a/contrib/storage-ipfs/src/main/java/org/apache/drill/exec/store/ipfs/IPFSCompat.java b/contrib/storage-ipfs/src/main/java/org/apache/drill/exec/store/ipfs/IPFSCompat.java
index 7ef67bf2029..aca5b109162 100644
--- a/contrib/storage-ipfs/src/main/java/org/apache/drill/exec/store/ipfs/IPFSCompat.java
+++ b/contrib/storage-ipfs/src/main/java/org/apache/drill/exec/store/ipfs/IPFSCompat.java
@@ -135,9 +135,9 @@ public class DHT {
      * @return List of Multiaddresses of the peer
      */
     public List<String> findpeerListTimeout(Multihash id, int timeout, ExecutorService executor) {
-      AtomicReference<List<String>> ret = new AtomicReference<>();
+      AtomicReference<List<String>> ret = new AtomicReference<>(new ArrayList<>());
       timeLimitedExec(
-          "name/resolve?arg=" + id,
+          "dht/findpeer?arg=" + id,
           timeout,
           res -> {
             Map peer = (Map) res;