diff --git a/pkg/services/tree/replicator.go b/pkg/services/tree/replicator.go
index 4aa1d710..b07f5f21 100644
--- a/pkg/services/tree/replicator.go
+++ b/pkg/services/tree/replicator.go
@@ -148,7 +148,7 @@ func (s *Service) pushToQueue(cid cidSDK.ID, treeID string, op *pilorama.LogMove
 		treeID: treeID,
 		op:     op,
 	}:
-	case <-s.closeCh:
+	default:
 	}
 }
 
diff --git a/pkg/services/tree/service.go b/pkg/services/tree/service.go
index 440165be..acec01f6 100644
--- a/pkg/services/tree/service.go
+++ b/pkg/services/tree/service.go
@@ -485,7 +485,8 @@ func (s *Service) Apply(_ context.Context, req *ApplyRequest) (*ApplyResponse, e
 		return nil, fmt.Errorf("can't parse meta-information: %w", err)
 	}
 
-	s.replicateLocalCh <- applyOp{
+	select {
+	case s.replicateLocalCh <- applyOp{
 		treeID:        req.GetBody().GetTreeId(),
 		CIDDescriptor: pilorama.CIDDescriptor{CID: cid, Position: pos, Size: size},
 		Move: pilorama.Move{
@@ -493,6 +494,8 @@ func (s *Service) Apply(_ context.Context, req *ApplyRequest) (*ApplyResponse, e
 			Child:  op.GetChildId(),
 			Meta:   meta,
 		},
+	}:
+	default:
 	}
 	return &ApplyResponse{Body: &ApplyResponse_Body{}, Signature: &Signature{}}, nil
 }