diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_public/impl/persqueue_impl.h b/ydb/public/sdk/cpp/client/ydb_persqueue_public/impl/persqueue_impl.h
index 5786a7b52207..519c3df9ef5f 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_public/impl/persqueue_impl.h
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_public/impl/persqueue_impl.h
@@ -56,7 +56,7 @@ class TPersQueueClient::TImpl : public TClientImplCommon<TPersQueueClient::TImpl
 
         bool autoPartitioningSettingsDefined = false;
         if (settings.MaxPartitionsCount_.Defined()) {
-            props.mutable_auto_partitioning_settings()->set_max_active_partitions(settings.PartitionsCount_);
+            props.mutable_auto_partitioning_settings()->set_max_active_partitions(*settings.MaxPartitionsCount_);
             autoPartitioningSettingsDefined = true;
         }
         if (settings.AutoPartitioningStrategy_.Defined()) {
@@ -76,9 +76,7 @@ class TPersQueueClient::TImpl : public TClientImplCommon<TPersQueueClient::TImpl
             autoPartitioningSettingsDefined = true;
         }
 
-        if (!autoPartitioningSettingsDefined) {
-            props.set_partitions_count(settings.PartitionsCount_);
-        } else {
+        if (autoPartitioningSettingsDefined) {
             props.mutable_auto_partitioning_settings()->set_min_active_partitions(settings.PartitionsCount_);
         }