diff --git a/core/commands/dht.go b/core/commands/dht.go
index 6e140dfac..aeaa7712b 100644
--- a/core/commands/dht.go
+++ b/core/commands/dht.go
@@ -81,19 +81,23 @@ var queryDhtCmd = &cmds.Command{
 			dht = nd.DHT.LAN
 		}
 
-		closestPeers, err := dht.GetClosestPeers(ctx, string(id))
-		if err != nil {
-			cancel()
-			return err
-		}
-
+		errCh := make(chan error, 1)
 		go func() {
+			defer close(errCh)
 			defer cancel()
-			for p := range closestPeers {
-				routing.PublishQueryEvent(ctx, &routing.QueryEvent{
-					ID:   p,
-					Type: routing.FinalPeer,
-				})
+			closestPeers, err := dht.GetClosestPeers(ctx, string(id))
+			if closestPeers != nil {
+				for p := range closestPeers {
+					routing.PublishQueryEvent(ctx, &routing.QueryEvent{
+						ID:   p,
+						Type: routing.FinalPeer,
+					})
+				}
+			}
+
+			if err != nil {
+				errCh <- err
+				return
 			}
 		}()
 
@@ -103,15 +107,13 @@ var queryDhtCmd = &cmds.Command{
 			}
 		}
 
-		return nil
+		return <-errCh
 	},
 	Encoders: cmds.EncoderMap{
 		cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *routing.QueryEvent) error {
 			pfm := pfuncMap{
-				routing.PeerResponse: func(obj *routing.QueryEvent, out io.Writer, verbose bool) error {
-					for _, p := range obj.Responses {
-						fmt.Fprintf(out, "%s\n", p.ID.Pretty())
-					}
+				routing.FinalPeer: func(obj *routing.QueryEvent, out io.Writer, verbose bool) error {
+					fmt.Fprintf(out, "%s\n", obj.ID)
 					return nil
 				},
 			}
diff --git a/test/sharness/t0170-dht.sh b/test/sharness/t0170-dht.sh
index 1e35a3a0b..e76b85860 100755
--- a/test/sharness/t0170-dht.sh
+++ b/test/sharness/t0170-dht.sh
@@ -76,16 +76,24 @@ test_dht() {
   
   
   # ipfs dht query <peerID>
-  ## We query 3 different keys, to statisically lower the chance that the queryer
-  ## turns out to be the closest to what a key hashes to.
-  # TODO: flaky. tracked by https://github.com/ipfs/go-ipfs/issues/2620
-  test_expect_success 'query' '
-    ipfsi 3 dht query "$(echo banana | ipfsi 3 add -q)" >actual &&
-    ipfsi 3 dht query "$(echo apple | ipfsi 3 add -q)" >>actual &&
-    ipfsi 3 dht query "$(echo pear | ipfsi 3 add -q)"  >>actual &&
-    PEERS=$(wc -l actual | cut -d '"'"' '"'"' -f 1) &&
-    [ -s actual ] ||
-    test_might_fail test_fsh cat actual
+  #
+  # We test all nodes. 4 nodes should see the same peer ID, one node (the
+  # closest) should see a different one.
+
+  for i in $(test_seq 0 4); do
+    test_expect_success "query from $i" '
+      ipfsi "$i" dht query "$HASH" | head -1 >closest-$i
+    '
+  done
+
+  test_expect_success "collecting results" '
+    cat closest-* | sort | uniq -c | sed -e "s/ *\([0-9]\+\) .*/\1/g" | sort -g > actual &&
+    echo 1 > expected &&
+    echo 4 >> expected
+  '
+
+  test_expect_success "checking results" '
+    test_cmp actual expected
   '
 
   test_expect_success 'stop iptb' '