diff --git a/ydb/services/datastreams/datastreams_proxy.cpp b/ydb/services/datastreams/datastreams_proxy.cpp
index 1665ad48511a..bf2b999fe059 100644
--- a/ydb/services/datastreams/datastreams_proxy.cpp
+++ b/ydb/services/datastreams/datastreams_proxy.cpp
@@ -1665,8 +1665,8 @@ namespace NKikimr::NDataStreams::V1 {
                 record->set_partition_key(r.GetPartitionKey());
                 record->set_sequence_number(std::to_string(r.GetOffset()).c_str());
 
-                if (!proto.has_codec()) {
-                    proto.set_codec(NPersQueueCommon::RAW);
+                if (proto.GetCodec() > 0) {
+                    record->set_codec(proto.GetCodec() + 1);
                 }
 
                 record->set_codec(proto.GetCodec() + 1);