diff --git a/src/Asv.Mavlink/Devices/Radio/Client/RadioClientDevice.cs b/src/Asv.Mavlink/Devices/Radio/Client/RadioClientDevice.cs
index d9933a8b..141c5b52 100644
--- a/src/Asv.Mavlink/Devices/Radio/Client/RadioClientDevice.cs
+++ b/src/Asv.Mavlink/Devices/Radio/Client/RadioClientDevice.cs
@@ -34,7 +34,7 @@ public RadioClientDevice(
         ILogger? logger = null)
         : base(connection, identity, config, seq, scheduler, logger)
     {
-        _logger ??= NullLogger.Instance;
+        _logger = logger ?? NullLogger.Instance;
         _config = config ?? throw new ArgumentNullException(nameof(config));
         Command = new CommandClient(connection, identity, seq, config.Command).DisposeItWith(Disposable);
         var client = new AsvRadioClient(connection, identity,seq).DisposeItWith(Disposable);
diff --git a/src/Asv.Mavlink/Devices/Vehicles/Client/Ardupilot/Plane/ArduPlaneClient.cs b/src/Asv.Mavlink/Devices/Vehicles/Client/Ardupilot/Plane/ArduPlaneClient.cs
index 2f4aa1b4..45379ffc 100644
--- a/src/Asv.Mavlink/Devices/Vehicles/Client/Ardupilot/Plane/ArduPlaneClient.cs
+++ b/src/Asv.Mavlink/Devices/Vehicles/Client/Ardupilot/Plane/ArduPlaneClient.cs
@@ -9,6 +9,7 @@
 using Asv.Mavlink.V2.Ardupilotmega;
 using Asv.Mavlink.V2.Minimal;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
 using ZLogger;
 
 namespace Asv.Mavlink;
@@ -27,6 +28,7 @@ public ArduPlaneClient(IMavlinkV2Connection connection, MavlinkClientIdentity id
         IScheduler? scheduler = null,
         ILogger? logger = null) : base(connection, identity, config, seq, scheduler,logger)
     {
+        _logger = logger ?? NullLogger.Instance;
     }
 
     protected override async Task InternalInit()
diff --git a/src/Asv.Mavlink/Tools/HierarchicalStore/Impl/FileSystemHierarchicalStore.cs b/src/Asv.Mavlink/Tools/HierarchicalStore/Impl/FileSystemHierarchicalStore.cs
index e2f2ddf1..912538ee 100644
--- a/src/Asv.Mavlink/Tools/HierarchicalStore/Impl/FileSystemHierarchicalStore.cs
+++ b/src/Asv.Mavlink/Tools/HierarchicalStore/Impl/FileSystemHierarchicalStore.cs
@@ -9,6 +9,7 @@
 using System.Threading;
 using Asv.Common;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
 using ZLogger;
 
 namespace Asv.Mavlink;
@@ -77,7 +78,7 @@ public class FileSystemHierarchicalStore<TKey, TFile>:DisposableOnceWithCancel,I
 {
     private readonly string _rootFolder;
     private readonly IHierarchicalStoreFormat<TKey,TFile> _format;
-    private readonly ILogger _logger;
+    private readonly ILogger? _logger;
     private readonly object _sync = new();
     private readonly RxValue<ushort> _count;
     private readonly RxValue<ulong> _size;
@@ -86,8 +87,9 @@ public class FileSystemHierarchicalStore<TKey, TFile>:DisposableOnceWithCancel,I
     private int _checkCacheInProgress;
     private readonly TimeSpan _fileCacheTime;
 
-    public FileSystemHierarchicalStore(string rootFolder, IHierarchicalStoreFormat<TKey,TFile> format, TimeSpan? fileCacheTime)
+    public FileSystemHierarchicalStore(string rootFolder, IHierarchicalStoreFormat<TKey,TFile> format, TimeSpan? fileCacheTime, ILogger? logger = null)
     {
+        _logger = logger ?? NullLogger.Instance;
         if (format == null) throw new ArgumentNullException(nameof(format));
         format.DisposeItWith(Disposable);
         if (string.IsNullOrEmpty(rootFolder))