diff --git a/src/Client/ClientBase.cpp b/src/Client/ClientBase.cpp
index 767a9b2b9f9..7a3192d1d9c 100644
--- a/src/Client/ClientBase.cpp
+++ b/src/Client/ClientBase.cpp
@@ -753,7 +753,7 @@ void ClientBase::setDefaultFormatsFromConfiguration()
         else
             default_output_format = "TSV";
     }
-    else if (is_interactive || stdout_is_a_tty)
+    else if (is_interactive)
     {
         default_output_format = "PrettyCompact";
     }
diff --git a/tests/queries/0_stateless/03021_output_format_tty.sh b/tests/queries/0_stateless/03021_output_format_tty.sh
index dfc37c3b30a..55dedeb6773 100755
--- a/tests/queries/0_stateless/03021_output_format_tty.sh
+++ b/tests/queries/0_stateless/03021_output_format_tty.sh
@@ -21,12 +21,6 @@ expect_after {
     -i $any_spawn_id timeout { exit 1 }
 }
 
-spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_CLIENT --query 'SELECT 1'"
-expect "│ 1 │"
-expect "└───┘"
-expect eof
-
-spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_LOCAL --query 'SELECT 2'"
-expect "│ 2 │"
-expect "└───┘"
+spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_CLIENT --query 'SELECT 1, 2'"
+expect "1\t2"
 expect eof