diff --git a/src/borg/chunker.pyx b/src/borg/chunker.pyx
index 6a13f4e86..b5dca07de 100644
--- a/src/borg/chunker.pyx
+++ b/src/borg/chunker.pyx
@@ -680,7 +680,7 @@ cdef class Chunker:
         self.remaining -= min_size
         sum = _buzhash(self.data + self.position, window_size, self.table)
 
-        while self.remaining > self.window_size and (sum & chunk_mask):
+        while self.remaining > self.window_size and (sum & chunk_mask) and not (self.eof and self.remaining <= window_size):
             p = self.data + self.position
             stop_at = p + self.remaining - window_size