diff --git a/pkg/services/tree/replicator.go b/pkg/services/tree/replicator.go
index 346198b3c..0949cd4c6 100644
--- a/pkg/services/tree/replicator.go
+++ b/pkg/services/tree/replicator.go
@@ -190,7 +190,7 @@ func (s *Service) pushToQueue(cid cidSDK.ID, treeID string, op *pilorama.Move) {
 		treeID: treeID,
 		op:     op,
 	}:
-	default:
+	case <-s.closeCh:
 	}
 }
 
diff --git a/pkg/services/tree/service.go b/pkg/services/tree/service.go
index b74f6d2b4..24526cbd6 100644
--- a/pkg/services/tree/service.go
+++ b/pkg/services/tree/service.go
@@ -664,7 +664,7 @@ func (s *Service) Apply(_ context.Context, req *ApplyRequest) (*ApplyResponse, e
 			Meta:   meta,
 		},
 	}:
-	default:
+	case <-s.closeCh:
 	}
 	return &ApplyResponse{Body: &ApplyResponse_Body{}, Signature: &Signature{}}, nil
 }