diff --git a/src/Core/Settings.h b/src/Core/Settings.h
index 6e06804d7252..7f8de1258d8b 100644
--- a/src/Core/Settings.h
+++ b/src/Core/Settings.h
@@ -1052,7 +1052,7 @@ class IColumn;
     M(Bool, output_format_parquet_parallel_encoding, true, "Do Parquet encoding in multiple threads. Requires output_format_parquet_use_custom_encoder.", 0) \
     M(UInt64, output_format_parquet_data_page_size, 1024 * 1024, "Target page size in bytes, before compression.", 0) \
     M(UInt64, output_format_parquet_batch_size, 1024, "Check page size every this many rows. Consider decreasing if you have columns with average values size above a few KBs.", 0) \
-    M(String, output_format_avro_codec, "", "Compression codec used for output. Possible values: 'null', 'deflate', 'snappy', 'zstandard'.", 0) \
+    M(String, output_format_avro_codec, "", "Compression codec used for output. Possible values: 'null', 'deflate', 'snappy', 'zstd'.", 0) \
     M(UInt64, output_format_avro_sync_interval, 16 * 1024, "Sync interval in bytes.", 0) \
     M(String, output_format_avro_string_column_pattern, "", "For Avro format: regexp of String columns to select as AVRO string.", 0) \
     M(UInt64, output_format_avro_rows_in_file, 1, "Max rows in a file (if permitted by storage)", 0) \
diff --git a/src/Processors/Formats/Impl/AvroRowOutputFormat.cpp b/src/Processors/Formats/Impl/AvroRowOutputFormat.cpp
index 5425a66d348e..d12adddf2c19 100644
--- a/src/Processors/Formats/Impl/AvroRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/AvroRowOutputFormat.cpp
@@ -527,12 +527,12 @@ static avro::Codec getCodec(const std::string & codec_name)
 
     if (codec_name == "null")    return avro::Codec::NULL_CODEC;
     if (codec_name == "deflate") return avro::Codec::DEFLATE_CODEC;
-    if (codec_name == "zstandard")
+    if (codec_name == "zstd")
         return avro::Codec::ZSTD_CODEC;
-#    ifdef SNAPPY_CODEC_AVAILABLE
+#ifdef SNAPPY_CODEC_AVAILABLE
     if (codec_name == "snappy")
         return avro::Codec::SNAPPY_CODEC;
-#    endif
+#endif
 
     throw Exception(ErrorCodes::BAD_ARGUMENTS, "Avro codec {} is not available", codec_name);
 }
diff --git a/tests/queries/0_stateless/02955_avro_format_zstd_encode_support.sql b/tests/queries/0_stateless/02955_avro_format_zstd_encode_support.sql
index 8ee80b007c33..b88e1dbccccf 100644
--- a/tests/queries/0_stateless/02955_avro_format_zstd_encode_support.sql
+++ b/tests/queries/0_stateless/02955_avro_format_zstd_encode_support.sql
@@ -5,7 +5,7 @@ CREATE TABLE t
     `n1` Int32
 )
 ENGINE = File(Avro)
-SETTINGS output_format_avro_codec = 'zstandard';
+SETTINGS output_format_avro_codec = 'zstd';
 
 INSERT INTO t SELECT *
 FROM numbers(10);