diff --git a/apps/server/AliasVault.Client/Services/ItemService.cs b/apps/server/AliasVault.Client/Services/ItemService.cs
index 95533609d..2794932c7 100644
--- a/apps/server/AliasVault.Client/Services/ItemService.cs
+++ b/apps/server/AliasVault.Client/Services/ItemService.cs
@@ -666,6 +666,7 @@ public sealed class ItemService(HttpClient httpClient, DbService dbService, Conf
     /// <summary>
     /// Hard delete all items from the database. This permanently removes all item records
     /// (including soft-deleted ones) from the database for a complete vault reset.
+    /// Also removes all folders.
     /// </summary>
     /// <returns>True if successful, false otherwise.</returns>
     public async Task<bool> HardDeleteAllItemsAsync()
@@ -675,9 +676,11 @@ public sealed class ItemService(HttpClient httpClient, DbService dbService, Conf
         // Hard delete all related entities and items.
         context.Attachments.RemoveRange(context.Attachments);
         context.FieldValues.RemoveRange(context.FieldValues);
+        context.FieldHistories.RemoveRange(context.FieldHistories);
         context.TotpCodes.RemoveRange(context.TotpCodes);
         context.Passkeys.RemoveRange(context.Passkeys);
         context.Items.RemoveRange(context.Items);
+        context.Folders.RemoveRange(context.Folders);
 
         // Save changes locally
         await context.SaveChangesAsync();