diff --git a/src/protocols/ssh/buffer.c b/src/protocols/ssh/buffer.c
index 15fb6982..209338ef 100644
--- a/src/protocols/ssh/buffer.c
+++ b/src/protocols/ssh/buffer.c
@@ -207,7 +207,7 @@ void guac_terminal_buffer_set_columns(guac_terminal_buffer* buffer, int row,
         *(current++) = *character;
 
     /* Update length depending on row written */
-    if (row >= buffer->length) 
+    if (character->value != 0 && row >= buffer->length) 
         buffer->length = row+1;
 
 }