diff --git a/lib/runner/connection/buffer.rb b/lib/runner/connection/buffer.rb
index b3421df8..12e99aa3 100644
--- a/lib/runner/connection/buffer.rb
+++ b/lib/runner/connection/buffer.rb
@@ -71,8 +71,8 @@ class Runner::Connection::Buffer
     @buffering = false
     @global_buffer = +''
     # For our buffering, we identified line breaks with the `\n` and removed those temporarily.
-    # Thus, we now re-add the `\n` at the end of the string and remove the `\r` at the same time.
-    message = message.gsub(/\r$/, "\n")
+    # Thus, we now re-add the `\n` at the end of the string and (optionally) remove a trailing `\r` at the same time.
+    message = message.gsub(/\r?$/, "\n")
     @line_buffer.push message
   end