diff --git a/mock/centralized_server.go b/mock/centralized_server.go
index 8e8d5d0b2171e6f844efa3260529a1bdd62e5fd7..c05ca9460bd497e09afa1cefdbd7c85d87e30f84 100644
--- a/mock/centralized_server.go
+++ b/mock/centralized_server.go
@@ -6,6 +6,7 @@ import (
 	"time"
 
 	ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore"
+	dssync "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore/sync"
 	key "github.com/ipfs/go-ipfs/blocks/key"
 	"github.com/ipfs/go-ipfs/util/testutil"
 	peer "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
@@ -74,7 +75,7 @@ func (rs *s) Providers(k key.Key) []peer.PeerInfo {
 }
 
 func (rs *s) Client(p testutil.Identity) Client {
-	return rs.ClientWithDatastore(context.Background(), p, ds.NewMapDatastore())
+	return rs.ClientWithDatastore(context.Background(), p, dssync.MutexWrap(ds.NewMapDatastore()))
 }
 
 func (rs *s) ClientWithDatastore(_ context.Context, p testutil.Identity, datastore ds.Datastore) Client {