diff --git a/k8s_gitlab_borg/__main__.py b/k8s_gitlab_borg/__main__.py
index d8febf7..253e58b 100644
--- a/k8s_gitlab_borg/__main__.py
+++ b/k8s_gitlab_borg/__main__.py
@@ -425,12 +425,10 @@ def main():
                         download_stream = download.stream(amt=1024 * 1024)
                         try:
                             while chunk := next(download_stream, b""):
-                                logger.debug("Read chunk of %d bytes", len(chunk))
+                                logger.debug("Read chunk of length %d", len(chunk))
                                 offset += len(chunk)
                                 retries = 10
-                                while pagesize_chunk := chunk[:PIPE_BUF]:
-                                    yield pagesize_chunk
-                                    chunk = chunk[PIPE_BUF:]
+                                yield chunk
                             else:
                                 break
                         except IncompleteRead as e:
@@ -482,17 +480,23 @@ def main():
                     pollc = 3
                     logger.debug("First poll...")
                     events = poll.poll()
-                    logger.debug("Done, %d events", len(events))
+                    logger.debug("Done, %d event(s)", len(events))
+                    pipe_buffer = b""
                     while pollc > 0 and len(events) > 0:
                         for rfd, event in events:
                             if event & select.POLLOUT:
                                 if rfd == proc.stdin.fileno():
-                                    if chunk := next(download_stream, b""):
+                                    if chunk := pipe_buffer[:PIPE_BUF]:
                                         logger.debug(
                                             "Writing chunk of length %d...", len(chunk)
                                         )
                                         proc.stdin.buffer.write(chunk)
                                         logger.debug("Done")
+                                        pipe_buffer = pipe_buffer[PIPE_BUF:]
+                                    elif pipe_buffer := next(download_stream, b""):
+                                        logger.debug(
+                                            "Accepted chunk of length %d", len(chunk)
+                                        )
                                     else:
                                         proc.stdin.close()
                             if event & select.POLLIN or event & select.POLLPRI:
@@ -522,10 +526,9 @@ def main():
                         if pollc > 0:
                             logger.debug("Poll...")
                             events = poll.poll()
-                            logger.debug("Done, %d events", len(events))
+                            logger.debug("Done, %d event(s)", len(events))
                         else:
                             logger.debug("Nothing left to poll")
-                            events = []
 
                     for handler in proc_logger.handlers:
                         handler.flush()