diff --git a/libs/rs/rsContext.cpp b/libs/rs/rsContext.cpp
index dfdeb98c99bc3..2a94651fb13f0 100644
--- a/libs/rs/rsContext.cpp
+++ b/libs/rs/rsContext.cpp
@@ -798,7 +798,7 @@ bool Context::sendMessageToClient(void *data, uint32_t cmdID, size_t len, bool w
         return false;
     }
     if (!waitForSpace) {
-        if (mIO.mToClient.getFreeSpace() < len) {
+        if (mIO.mToClient.getFreeSpace() <= (len + 8)) {
             // Not enough room, and not waiting.
             return false;
         }