diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2f12fc..1282dad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,9 @@ CHANGES:
 * Add ability to set custom dialer in InstaceInfo.
 * Router.Call: retry on VShardErrNameTransferIsInProgress error as in the `vshard` module (#75).
 
+BUG FIXES:
+* Router.bucketSearchBatched: do not flush out routeMap (#79).
+
 ## v2.0.5
 
 The go-vshard team apologizes for changing the interfaces to experimental status.
diff --git a/discovery.go b/discovery.go
index 4f70cd5..2e059de 100644
--- a/discovery.go
+++ b/discovery.go
@@ -169,7 +169,7 @@ func (r *Router) bucketSearchBatched(ctx context.Context, bucketIDToFind uint64)
 				rs = rsFuture.rs
 			}
 
-			routeMap[bucketID].Store(rs)
+			routeMap[bucketID].Store(rsFuture.rs)
 		}
 
 		if bucketIDWasFound := rs != nil; !bucketIDWasFound {