diff --git a/pyinfra/server/bufferizer/lazy_bufferizer.py b/pyinfra/server/bufferizer/lazy_bufferizer.py
index 4c3feab..8bafd59 100644
--- a/pyinfra/server/bufferizer/lazy_bufferizer.py
+++ b/pyinfra/server/bufferizer/lazy_bufferizer.py
@@ -30,15 +30,14 @@ class Queue:
 
 
 class FlatStreamBuffer:
-    """Produces a function, which applied to n inputs, produces m >= n outputs, when called m times. If m > n, then the
-    function needs to be called m - n times with `Nothing` to return the remaining values.
-    """
+    """Wraps a stream buffer and chains its output. Also flushes the stream buffer when applied to an iterable."""
 
     def __init__(self, fn, buffer_size=3):
         """Function `fn` Needs to be a mappable generator."""
         self.fn = lift(StreamBuffer(fn, buffer_size=buffer_size))
 
     def __call__(self, items):
+        items = chain(items, [Nothing])
         yield from compose(flatten, self.fn)(items)
 
 
diff --git a/pyinfra/server/server.py b/pyinfra/server/server.py
index 420f688..ab8a37e 100644
--- a/pyinfra/server/server.py
+++ b/pyinfra/server/server.py
@@ -1,5 +1,4 @@
 import logging
-from itertools import chain
 
 from flask import Flask, jsonify, request
 from funcy import compose, identity, first
@@ -35,7 +34,7 @@ class LazyProcessor:
         self.queue.append(item)
 
     def pop(self):
-        items = chain(stream_queue(self.queue), [Nothing])
+        items = stream_queue(self.queue)
         result = first(self.stream_buffer(items)) or Nothing
         return result