diff --git a/cloud/blockstore/libs/daemon/ydb/bootstrap.cpp b/cloud/blockstore/libs/daemon/ydb/bootstrap.cpp
index 54ab77972a9..60020decd37 100644
--- a/cloud/blockstore/libs/daemon/ydb/bootstrap.cpp
+++ b/cloud/blockstore/libs/daemon/ydb/bootstrap.cpp
@@ -569,16 +569,16 @@ void TBootstrapYdb::InitKikimrService()
     args.NvmeManager = NvmeManager;
     args.UserCounterProviders = {VolumeStats->GetUserCounters()};
     args.IsDiskRegistrySpareNode = [&] {
-        if (!Configs->StorageConfig->GetDisableLocalService()) {
-            return false;
-        }
+            if (!Configs->StorageConfig->GetDisableLocalService()) {
+                return false;
+            }
 
-        const auto& nodes = Configs->StorageConfig->GetKnownSpareNodes();
-        const auto& fqdn = FQDNHostName();
-        const ui32 p = Configs->StorageConfig->GetSpareNodeProbability();
+            const auto& nodes = Configs->StorageConfig->GetKnownSpareNodes();
+            const auto& fqdn = FQDNHostName();
+            const ui32 p = Configs->StorageConfig->GetSpareNodeProbability();
 
-        return FindPtr(nodes, fqdn) || CityHash64(fqdn) % 100 < p;
-    }();
+            return FindPtr(nodes, fqdn) || CityHash64(fqdn) % 100 < p;
+        }();
     args.VolumeBalancerSwitch = VolumeBalancerSwitch;
     args.EndpointEventHandler = EndpointEventHandler;
     args.RootKmsKeyProvider = RootKmsKeyProvider;
diff --git a/cloud/blockstore/libs/storage/service/service_actor_create.cpp b/cloud/blockstore/libs/storage/service/service_actor_create.cpp
index e313eae21c0..1bd848d538c 100644
--- a/cloud/blockstore/libs/storage/service/service_actor_create.cpp
+++ b/cloud/blockstore/libs/storage/service/service_actor_create.cpp
@@ -56,10 +56,6 @@ class TCreateVolumeActor final
 
     void DescribeBaseVolume(const TActorContext& ctx);
     void CreateVolume(const TActorContext& ctx);
-    void HandleCreateEncryptionKeyResponse(
-    const TEvServicePrivate::TEvCreateEncryptionKeyResponse::TPtr& ev,
-    const TActorContext& ctx);
-
     void CreateVolumeImpl(
         const TActorContext& ctx,
         std::optional<NKikimrBlockStore::TEncryptionDesc> encryptionDesc);
@@ -76,6 +72,10 @@ class TCreateVolumeActor final
         const TEvVolume::TEvWaitReadyResponse::TPtr& ev,
         const TActorContext& ctx);
 
+    void HandleCreateEncryptionKeyResponse(
+        const TEvServicePrivate::TEvCreateEncryptionKeyResponse::TPtr& ev,
+        const TActorContext& ctx);
+
     void ReplyAndDie(
         const TActorContext& ctx,
         std::unique_ptr<TEvService::TEvCreateVolumeResponse> response);