diff --git a/mercurial/wireprotoframing.py b/mercurial/wireprotoframing.py
--- a/mercurial/wireprotoframing.py
+++ b/mercurial/wireprotoframing.py
@@ -531,6 +531,9 @@
         # * If a chunk causes us to go over our buffering limit, we flush
         #   and then buffer the new chunk.
 
+        if not data:
+            return
+
         if len(data) > self._maxsize:
             for frame in self._flush():
                 yield frame
@@ -573,6 +576,9 @@
         self._chunks[:] = []
         self._chunkssize = 0
 
+        if not payload:
+            return
+
         yield self._stream.makeframe(
             self._requestid,
             typeid=FRAME_TYPE_COMMAND_RESPONSE,
diff --git a/tests/test-wireproto-serverreactor.py b/tests/test-wireproto-serverreactor.py
--- a/tests/test-wireproto-serverreactor.py
+++ b/tests/test-wireproto-serverreactor.py
@@ -394,7 +394,6 @@
             b'1 2 0 command-response continuation Y\x80d',
             b'1 2 0 command-response continuation %s' % first,
             b'1 2 0 command-response continuation %s' % second,
-            b'1 2 0 command-response continuation ',
             b'1 2 0 command-response eos '
         ])