diff --git a/ydb/core/blobstorage/vdisk/repl/query_donor.h b/ydb/core/blobstorage/vdisk/repl/query_donor.h
index ffd59a535d3b..dbdc02b8a880 100644
--- a/ydb/core/blobstorage/vdisk/repl/query_donor.h
+++ b/ydb/core/blobstorage/vdisk/repl/query_donor.h
@@ -68,10 +68,9 @@ namespace NKikimr {
             }
 
             if (action) {
-                const TActorId temp(actorId);
                 LOG_DEBUG_S(*TlsActivationContext, NKikimrServices::BS_VDISK_GET, SelfId() << " sending " << query->ToString()
-                    << " to " << temp);
-                Send(actorId, query.release());
+                    << " to " << actorId);
+                Send(actorId, query.release(), IEventHandle::FlagTrackDelivery);
             } else {
                 PassAway();
             }
@@ -116,6 +115,7 @@ namespace NKikimr {
 
         STRICT_STFUNC(StateFunc,
             hFunc(TEvBlobStorage::TEvVGetResult, Handle);
+            cFunc(TEvents::TSystem::Undelivered, Step);
             cFunc(TEvents::TSystem::Poison, PassAway);
         )
     };