diff --git a/src/ImageSharp/IO/BufferedReadStream.cs b/src/ImageSharp/IO/BufferedReadStream.cs
index 02015eb56a..acba3eff0a 100644
--- a/src/ImageSharp/IO/BufferedReadStream.cs
+++ b/src/ImageSharp/IO/BufferedReadStream.cs
@@ -87,7 +87,7 @@ public override long Position
             set
             {
                 Guard.MustBeGreaterThanOrEqualTo(value, 0, nameof(this.Position));
-                Guard.MustBeLessThan(value, this.Length, nameof(this.Position));
+                Guard.MustBeLessThanOrEqualTo(value, this.Length, nameof(this.Position));
 
                 // Only reset readBufferIndex if we are out of bounds of our working buffer
                 // otherwise we should simply move the value by the diff.
diff --git a/tests/ImageSharp.Tests/IO/BufferedReadStreamTests.cs b/tests/ImageSharp.Tests/IO/BufferedReadStreamTests.cs
index 6ceaca012e..8e73218647 100644
--- a/tests/ImageSharp.Tests/IO/BufferedReadStreamTests.cs
+++ b/tests/ImageSharp.Tests/IO/BufferedReadStreamTests.cs
@@ -322,7 +322,21 @@ public void BufferedStreamThrowsOnBadPosition(int bufferSize)
                 using (var reader = new BufferedReadStream(this.configuration, stream))
                 {
                     Assert.Throws<ArgumentOutOfRangeException>(() => reader.Position = -stream.Length);
-                    Assert.Throws<ArgumentOutOfRangeException>(() => reader.Position = stream.Length);
+                    Assert.Throws<ArgumentOutOfRangeException>(() => reader.Position = stream.Length + 1);
+                }
+            }
+        }
+
+        [Fact]
+        public void BufferedStreamCanSetPositionToEnd()
+        {
+            var bufferSize = 8;
+            this.configuration.StreamProcessingBufferSize = bufferSize;
+            using (MemoryStream stream = this.CreateTestStream(bufferSize * 2))
+            {
+                using (var reader = new BufferedReadStream(this.configuration, stream))
+                {
+                    reader.Position = reader.Length;
                 }
             }
         }