diff --git a/core/src/stored/backends/chunked_device.cc b/core/src/stored/backends/chunked_device.cc
index f6a909f242c..2fc278558ca 100644
--- a/core/src/stored/backends/chunked_device.cc
+++ b/core/src/stored/backends/chunked_device.cc
@@ -729,7 +729,7 @@ ssize_t ChunkedDevice::ReadChunked(int fd, void* buffer, size_t count)
        */
       while (retval < (ssize_t)count) {
         // See how much is left in this chunk.
-        if (offset_ < current_chunk_->end_offset) {
+        if (offset_ <= current_chunk_->end_offset) {
           wanted_offset = (offset_ % current_chunk_->chunk_size);
           bytes_left = MIN((ssize_t)(count - offset),
                            (ssize_t)(current_chunk_->buflen - wanted_offset));
@@ -855,7 +855,7 @@ ssize_t ChunkedDevice::WriteChunked(int fd, const void* buffer, size_t count)
        */
       while (retval < (ssize_t)count) {
         // See how much is left in this chunk.
-        if (offset_ < current_chunk_->end_offset) {
+        if (offset_ <= current_chunk_->end_offset) {
           wanted_offset = (offset_ % current_chunk_->chunk_size);
           bytes_left
               = MIN((ssize_t)(count - offset),