diff --git a/src/Parsers/ASTQueryWithOutput.cpp b/src/Parsers/ASTQueryWithOutput.cpp
index 3890ed2347a..e47f4dcf29d 100644
--- a/src/Parsers/ASTQueryWithOutput.cpp
+++ b/src/Parsers/ASTQueryWithOutput.cpp
@@ -74,12 +74,23 @@ bool ASTQueryWithOutput::resetOutputASTIfExist(IAST & ast)
     /// FIXME: try to prettify this cast using `as<>()`
     if (auto * ast_with_output = dynamic_cast<ASTQueryWithOutput *>(&ast))
     {
-        ast_with_output->out_file.reset();
-        ast_with_output->format.reset();
-        ast_with_output->settings_ast.reset();
-        ast_with_output->compression.reset();
-        ast_with_output->compression_level.reset();
-        ast_with_output->children.clear();
+        auto remove_if_exists = [&](ASTPtr & p)
+        {
+            if (p)
+            {
+                if (auto it = std::find(ast_with_output->children.begin(), ast_with_output->children.end(), p);
+                    it != ast_with_output->children.end())
+                    ast_with_output->children.erase(it);
+                p.reset();
+            }
+        };
+
+        remove_if_exists(ast_with_output->out_file);
+        remove_if_exists(ast_with_output->format);
+        remove_if_exists(ast_with_output->settings_ast);
+        remove_if_exists(ast_with_output->compression);
+        remove_if_exists(ast_with_output->compression_level);
+
         return true;
     }
 
diff --git a/src/Parsers/ParserQueryWithOutput.cpp b/src/Parsers/ParserQueryWithOutput.cpp
index 7a627ae5f6a..4a0b928608b 100644
--- a/src/Parsers/ParserQueryWithOutput.cpp
+++ b/src/Parsers/ParserQueryWithOutput.cpp
@@ -136,6 +136,7 @@ bool ParserQueryWithOutput::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
             ParserStringLiteral compression;
             if (!compression.parse(pos, query_with_output.compression, expected))
                 return false;
+            query_with_output.children.push_back(query_with_output.compression);
 
             ParserKeyword s_compression_level("LEVEL");
             if (s_compression_level.ignore(pos, expected))
@@ -143,6 +144,7 @@ bool ParserQueryWithOutput::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
                 ParserNumber compression_level;
                 if (!compression_level.parse(pos, query_with_output.compression_level, expected))
                     return false;
+                query_with_output.children.push_back(query_with_output.compression_level);
             }
         }