diff --git a/CHANGELOG.md b/CHANGELOG.md
index dccc4a72e879..f63afd6e6e4b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -102,6 +102,9 @@
 - [#4297](https://github.com/ChainSafe/forest/pull/4297) Fixed double decoding
   of message in the `Filecoin.WalletSign` RPC method.
 
+- [#4328](https://github.com/ChainSafe/forest/pull/4328) Fix issues when
+  connecting to a network with fewer than 5 peers.
+
 ## Forest 0.17.2 "Dovakhin"
 
 This is a **mandatory** release for all mainnet node operators. It changes the
diff --git a/src/chain_sync/chain_muxer.rs b/src/chain_sync/chain_muxer.rs
index eae13cd4c401..e07f6e4c4f35 100644
--- a/src/chain_sync/chain_muxer.rs
+++ b/src/chain_sync/chain_muxer.rs
@@ -44,7 +44,7 @@ use crate::chain_sync::{
 // Sync the messages for one or many tipsets @ a time
 // Lotus uses a window size of 8: https://github.com/filecoin-project/lotus/blob/c1d22d8b3298fdce573107413729be608e72187d/chain/sync.go#L56
 const DEFAULT_REQUEST_WINDOW: usize = 8;
-const DEFAULT_TIPSET_SAMPLE_SIZE: usize = 5;
+const DEFAULT_TIPSET_SAMPLE_SIZE: usize = 1;
 const DEFAULT_RECENT_STATE_ROOTS: i64 = 2000;
 
 pub(in crate::chain_sync) type WorkerState = Arc<RwLock<SyncState>>;