diff --git a/src/config.c b/src/config.c
index 62279a67..a08e41b8 100644
--- a/src/config.c
+++ b/src/config.c
@@ -394,6 +394,11 @@ ssh_config_parse_line(ssh_session session,
   long l;
   int64_t ll;
 
+  /* Ignore empty lines */
+  if (line == NULL || *line == '\0') {
+    return 0;
+  }
+
   x = s = strdup(line);
   if (s == NULL) {
     ssh_set_error_oom(session);