diff --git a/Oqtane.Client/Services/FileService.cs b/Oqtane.Client/Services/FileService.cs
index 2d6ee55f..c01f1160 100644
--- a/Oqtane.Client/Services/FileService.cs
+++ b/Oqtane.Client/Services/FileService.cs
@@ -47,7 +47,7 @@ namespace Oqtane.Services
             var path = WebUtility.UrlEncode(folderPath);
 
             List<File> files = await GetJsonAsync<List<File>>($"{Apiurl}/{siteId}/{path}");
-            return files.OrderBy(item => item.Name).ToList();
+            return files?.OrderBy(item => item.Name).ToList();
         }
 
         public async Task<File> GetFileAsync(int fileId)