diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index b59791d437..35fb2d275f 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -1047,7 +1047,10 @@ static int parse_argv(int argc, char *argv[]) {
                         assert_not_reached();
                 }
 
-        if (arg_follow && !arg_no_tail && !arg_since_set && arg_lines == ARG_LINES_DEFAULT)
+        if (arg_no_tail)
+                arg_lines = ARG_LINES_ALL;
+
+        if (arg_follow && !arg_since_set && arg_lines == ARG_LINES_DEFAULT)
                 arg_lines = 10;
 
         if (arg_follow && !arg_merge && !arg_boot) {