diff --git a/commonspace/objectsync/msgpool.go b/commonspace/objectsync/msgpool.go
index db6a15e4..19098ace 100644
--- a/commonspace/objectsync/msgpool.go
+++ b/commonspace/objectsync/msgpool.go
@@ -53,9 +53,11 @@ func newMessagePool(peerManager peermanager.PeerManager, messageHandler MessageH
 
 func (s *messagePool) SendSync(ctx context.Context, peerId string, msg *spacesyncproto.ObjectSyncMessage) (reply *spacesyncproto.ObjectSyncMessage, err error) {
 	s.updateLastUsage()
-	var cancel context.CancelFunc
-	ctx, cancel = context.WithTimeout(ctx, time.Minute)
-	defer cancel()
+	if _, ok := ctx.Deadline(); !ok {
+		var cancel context.CancelFunc
+		ctx, cancel = context.WithTimeout(ctx, time.Minute)
+		defer cancel()
+	}
 	newCounter := s.counter.Add(1)
 	msg.RequestId = genReplyKey(peerId, msg.ObjectId, newCounter)
 	log.InfoCtx(ctx, "mpool sendSync", zap.String("requestId", msg.RequestId))