diff --git a/VoidCat/Services/Files/FileStorageStartup.cs b/VoidCat/Services/Files/FileStorageStartup.cs
index 713f090..bd6f9ba 100644
--- a/VoidCat/Services/Files/FileStorageStartup.cs
+++ b/VoidCat/Services/Files/FileStorageStartup.cs
@@ -14,8 +14,11 @@ public static class FileStorageStartup
         if (settings.CloudStorage != default)
         {
             // cloud storage
-            services.AddSingleton<IFileStore, S3FileStore>();
-            services.AddSingleton<IFileMetadataStore, S3FileMetadataStore>();
+            if (settings.CloudStorage.S3 != default)
+            {
+                services.AddSingleton<IFileStore, S3FileStore>();
+                services.AddSingleton<IFileMetadataStore, S3FileMetadataStore>();
+            }
         }
         else
         {
diff --git a/VoidCat/Services/Files/LocalDiskFileStorage.cs b/VoidCat/Services/Files/LocalDiskFileStorage.cs
index 5bff80e..5ee8ce4 100644
--- a/VoidCat/Services/Files/LocalDiskFileStorage.cs
+++ b/VoidCat/Services/Files/LocalDiskFileStorage.cs
@@ -47,7 +47,7 @@ public class LocalDiskFileStore : StreamFileStore, IFileStore
 
     public ValueTask<PagedResult<PublicVoidFile>> ListFiles(PagedRequest request)
     {
-        var files = Directory.EnumerateFiles(_settings.DataDirectory)
+        var files = Directory.EnumerateFiles(Path.Combine(_settings.DataDirectory, FilesDir))
             .Where(a => !Path.HasExtension(a));
 
         files = (request.SortBy, request.SortOrder) switch