diff --git a/src/app-layer-ssh.c b/src/app-layer-ssh.c
index 291543236f..8205c4709a 100644
--- a/src/app-layer-ssh.c
+++ b/src/app-layer-ssh.c
@@ -104,9 +104,9 @@ static int SSHParseBanner(SshState *state, SshHeader *header, const uint8_t *inp
         SCReturnInt(0);
     }
 
-    const uint8_t *sw_end = BasicSearch(line_ptr, line_len, (uint8_t*)" ", 1);
+    const uint8_t *sw_end = BasicSearch(line_ptr, line_len, (uint8_t*)"\r", 1);
     if (sw_end == NULL) {
-        sw_end = BasicSearch(line_ptr, line_len, (uint8_t*)"\r", 1);
+        sw_end = BasicSearch(line_ptr, line_len, (uint8_t*)"\n", 1);
         if (sw_end == NULL) {
             sw_end = line_ptr + line_len;
         }