diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72a06904..9dfbe95c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Unreleased
 
+Fixed:
+
+- [`infinite_scroll`](https://halloy.squidowl.org/configuration/buffer.html?highlight=infinite#infinite_scroll) was defaulting to `false`, contrary to its documented default value.  Now defaults to `true`.
+
 # 2025.1 (2025-02-02)
 
 Added:
diff --git a/data/src/config/buffer.rs b/data/src/config/buffer.rs
index 20124770..7ea9f199 100644
--- a/data/src/config/buffer.rs
+++ b/data/src/config/buffer.rs
@@ -176,12 +176,20 @@ impl Default for InternalMessage {
     }
 }
 
-#[derive(Debug, Clone, Default, Deserialize)]
+#[derive(Debug, Clone, Deserialize)]
 pub struct ChatHistory {
-    #[serde(default)]
+    #[serde(default = "default_bool_true")]
     pub infinite_scroll: bool,
 }
 
+impl Default for ChatHistory {
+    fn default() -> Self {
+        Self {
+            infinite_scroll: true,
+        }
+    }
+}
+
 #[derive(Debug, Copy, Clone, Default, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 pub enum UsernameFormat {