diff --git a/src/process_messages.jl b/src/process_messages.jl
index e68e05b..63d4c2a 100644
--- a/src/process_messages.jl
+++ b/src/process_messages.jl
@@ -167,7 +167,7 @@ function message_handler_loop(r_stream::IO, w_stream::IO, incoming::Bool)
 
         readbytes!(r_stream, boundary, length(MSG_BOUNDARY))
 
-        while true
+        while !(incoming && eof(r_stream))
             reset_state(serializer)
             header = deserialize_hdr_raw(r_stream)
             # println("header: ", header)