diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10eb412..4e82b2c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,11 @@ All notable changes to **ValueStringBuilder** will be documented in this file. T
 
 ## [Unreleased]
 
+### Changed
+
+- Optimized `Replace(char, char)` (by @Joy-less in #241)
+- Optimized `Replace(ReadOnlySpan<char>, ReadOnlySpan<char>)` when both spans are length 1 (by @Joy-less in #241)
+
 ## [2.4.0] - 2025-02-21
 
 ### Added
diff --git a/src/LinkDotNet.StringBuilder/ValueStringBuilder.Replace.cs b/src/LinkDotNet.StringBuilder/ValueStringBuilder.Replace.cs
index 967515f..ebf41f6 100644
--- a/src/LinkDotNet.StringBuilder/ValueStringBuilder.Replace.cs
+++ b/src/LinkDotNet.StringBuilder/ValueStringBuilder.Replace.cs
@@ -26,13 +26,7 @@ public readonly void Replace(char oldValue, char newValue, int startIndex, int c
         ArgumentOutOfRangeException.ThrowIfLessThan(startIndex, 0);
         ArgumentOutOfRangeException.ThrowIfGreaterThan(startIndex + count, Length);
 
-        for (var i = startIndex; i < startIndex + count; i++)
-        {
-            if (buffer[i] == oldValue)
-            {
-                buffer[i] = newValue;
-            }
-        }
+        buffer.Slice(startIndex, count).Replace(oldValue, newValue);
     }
 
     /// <summary>
@@ -97,6 +91,12 @@ public void Replace(scoped ReadOnlySpan<char> oldValue, scoped ReadOnlySpan<char
             return;
         }
 
+        if (oldValue.Length == 1 && newValue.Length == 1)
+        {
+            Replace(oldValue[0], newValue[0], startIndex, count);
+            return;
+        }
+
         var index = startIndex;
         var remainingChars = count;
 
diff --git a/src/LinkDotNet.StringBuilder/ValueStringBuilderExtensions.cs b/src/LinkDotNet.StringBuilder/ValueStringBuilderExtensions.cs
index 4487bbe..1d9dc51 100644
--- a/src/LinkDotNet.StringBuilder/ValueStringBuilderExtensions.cs
+++ b/src/LinkDotNet.StringBuilder/ValueStringBuilderExtensions.cs
@@ -29,7 +29,7 @@ public static ValueStringBuilder ToValueStringBuilder(this System.Text.StringBui
     {
         ArgumentNullException.ThrowIfNull(builder);
 
-        var valueStringBuilder = new ValueStringBuilder();
+        var valueStringBuilder = new ValueStringBuilder(builder.Length);
         foreach (var chunk in builder.GetChunks())
         {
             valueStringBuilder.Append(chunk.Span);