diff --git a/cloud/blockstore/libs/storage/disk_registry/disk_registry_state.cpp b/cloud/blockstore/libs/storage/disk_registry/disk_registry_state.cpp
index e56b8952e5c..8c91b2f56f5 100644
--- a/cloud/blockstore/libs/storage/disk_registry/disk_registry_state.cpp
+++ b/cloud/blockstore/libs/storage/disk_registry/disk_registry_state.cpp
@@ -3969,11 +3969,9 @@ NProto::TError TDiskRegistryState::UpdateAgentCounters(
             return MakeError(
                 E_ARGUMENT,
                 TStringBuilder()
-                    << "Unexpected device. DeviceId: \"" << uuid
-                    << "\" Sender node id: " << stats.GetNodeId()
-                    << " Found node id: "
-                    << (knownDevice ? ToString(knownDevice->GetNodeId())
-                                    : "null"));
+                    << "Unexpected device. DeviceId: " << uuid.Quote()
+                    << " Sender node id: " << stats.GetNodeId()
+                    << " Found node id: " << knownDevice->GetNodeId());
         }
     }