diff --git a/Notesnook.API/Accessors/SyncItemsRepositoryAccessor.cs b/Notesnook.API/Accessors/SyncItemsRepositoryAccessor.cs
index 8f2a1ae..07933c7 100644
--- a/Notesnook.API/Accessors/SyncItemsRepositoryAccessor.cs
+++ b/Notesnook.API/Accessors/SyncItemsRepositoryAccessor.cs
@@ -32,7 +32,7 @@ namespace Notesnook.API.Accessors
         public SyncItemsRepository<Relation> Relations { get; }
         public SyncItemsRepository<Reminder> Reminders { get; }
         public SyncItemsRepository<Content> Contents { get; }
-        public SyncItemsRepository<Setting> Settings { get; }
+        public SyncItemsRepository<Setting> LegacySettings { get; }
         public SyncItemsRepository<Attachment> Attachments { get; }
         public SyncItemsRepository<Color> Colors { get; }
         public SyncItemsRepository<Tag> Tags { get; }
@@ -42,7 +42,7 @@ namespace Notesnook.API.Accessors
         public SyncItemsRepositoryAccessor(SyncItemsRepository<Note> _notes,
         SyncItemsRepository<Notebook> _notebooks,
         SyncItemsRepository<Content> _content,
-        SyncItemsRepository<Setting> _settings,
+        SyncItemsRepository<Setting> _legacySettings,
         SyncItemsRepository<Attachment> _attachments,
         SyncItemsRepository<Shortcut> _shortcuts,
         SyncItemsRepository<Relation> _relations,
@@ -56,6 +56,7 @@ namespace Notesnook.API.Accessors
             Notes = _notes;
             Contents = _content;
             Settings = _settings;
+            LegacySettings = _legacySettings;
             Attachments = _attachments;
             UsersSettings = _usersSettings;
             Monographs = _monographs;
diff --git a/Notesnook.API/Hubs/SyncHub.cs b/Notesnook.API/Hubs/SyncHub.cs
index 797755c..3eee83f 100644
--- a/Notesnook.API/Hubs/SyncHub.cs
+++ b/Notesnook.API/Hubs/SyncHub.cs
@@ -254,7 +254,7 @@ namespace Notesnook.API.Hubs
                             var settings = JsonSerializer.Deserialize<Setting>(data);
                             settings.Id = MongoDB.Bson.ObjectId.Parse(userId);
                             settings.ItemId = userId;
-                            Repositories.Settings.Upsert(settings, userId, dateSynced);
+                            Repositories.LegacySettings.Upsert(settings, userId, dateSynced);
                             break;
                         case "vaultKey":
                             userSettings.VaultKey = JsonSerializer.Deserialize<EncryptedData>(data);
@@ -339,7 +339,7 @@ namespace Notesnook.API.Hubs
                     if (settings == null) return 0;
                     settings.Id = MongoDB.Bson.ObjectId.Parse(userId);
                     settings.ItemId = userId;
-                    Repositories.Settings.Upsert(settings, userId, dateSynced);
+                    Repositories.LegacySettings.Upsert(settings, userId, dateSynced);
                 }
                 else
                 {
@@ -464,7 +464,7 @@ namespace Notesnook.API.Hubs
 
             var chunks = PrepareChunks(
                 collections: new[] {
-                    Repositories.Settings.FindItemsSyncedAfter,
+                    Repositories.LegacySettings.FindItemsSyncedAfter,
                     Repositories.Attachments.FindItemsSyncedAfter,
                     Repositories.Notes.FindItemsSyncedAfter,
                     Repositories.Notebooks.FindItemsSyncedAfter,
@@ -526,7 +526,7 @@ namespace Notesnook.API.Hubs
                             Repositories.Notes.CountItemsSyncedAfterAsync(userId, lastSyncedTimestamp),
                             Repositories.Notebooks.CountItemsSyncedAfterAsync(userId, lastSyncedTimestamp),
                             Repositories.Contents.CountItemsSyncedAfterAsync(userId, lastSyncedTimestamp),
-                            Repositories.Settings.CountItemsSyncedAfterAsync(userId, lastSyncedTimestamp),
+                            Repositories.LegacySettings.CountItemsSyncedAfterAsync(userId, lastSyncedTimestamp),
                             Repositories.Shortcuts.CountItemsSyncedAfterAsync(userId, lastSyncedTimestamp),
                             Repositories.Reminders.CountItemsSyncedAfterAsync(userId, lastSyncedTimestamp),
                             Repositories.Relations.CountItemsSyncedAfterAsync(userId, lastSyncedTimestamp),
@@ -545,7 +545,7 @@ namespace Notesnook.API.Hubs
             }
 
             var collections = new[] {
-                Repositories.Settings.FindItemsSyncedAfter,
+                Repositories.LegacySettings.FindItemsSyncedAfter,
                 Repositories.Attachments.FindItemsSyncedAfter,
                 Repositories.Notes.FindItemsSyncedAfter,
                 Repositories.Notebooks.FindItemsSyncedAfter,
diff --git a/Notesnook.API/Interfaces/ISyncItemsRepositoryAccessor.cs b/Notesnook.API/Interfaces/ISyncItemsRepositoryAccessor.cs
index ea4214f..2131e44 100644
--- a/Notesnook.API/Interfaces/ISyncItemsRepositoryAccessor.cs
+++ b/Notesnook.API/Interfaces/ISyncItemsRepositoryAccessor.cs
@@ -32,7 +32,7 @@ namespace Notesnook.API.Interfaces
         SyncItemsRepository<Reminder> Reminders { get; }
         SyncItemsRepository<Relation> Relations { get; }
         SyncItemsRepository<Content> Contents { get; }
-        SyncItemsRepository<Setting> Settings { get; }
+        SyncItemsRepository<Setting> LegacySettings { get; }
         SyncItemsRepository<Attachment> Attachments { get; }
         SyncItemsRepository<Color> Colors { get; }
         SyncItemsRepository<Tag> Tags { get; }
diff --git a/Notesnook.API/Services/UserService.cs b/Notesnook.API/Services/UserService.cs
index a255fdb..9e6e2a8 100644
--- a/Notesnook.API/Services/UserService.cs
+++ b/Notesnook.API/Services/UserService.cs
@@ -167,18 +167,7 @@ namespace Notesnook.API.Services
         {
             var cc = new CancellationTokenSource();
 
-            Repositories.Notes.DeleteByUserId(userId);
-            Repositories.Notebooks.DeleteByUserId(userId);
-            Repositories.Shortcuts.DeleteByUserId(userId);
-            Repositories.Contents.DeleteByUserId(userId);
-            Repositories.Settings.DeleteByUserId(userId);
-            Repositories.Attachments.DeleteByUserId(userId);
-            Repositories.Reminders.DeleteByUserId(userId);
-            Repositories.Relations.DeleteByUserId(userId);
-            Repositories.Colors.DeleteByUserId(userId);
-            Repositories.Tags.DeleteByUserId(userId);
-            Repositories.UsersSettings.Delete((u) => u.UserId == userId);
-            Repositories.Monographs.DeleteMany((m) => m.UserId == userId);
+                Repositories.LegacySettings.DeleteByUserId(userId);
 
             if (!Constants.IS_SELF_HOSTED)
             {
@@ -215,6 +204,7 @@ namespace Notesnook.API.Services
             Repositories.Shortcuts.DeleteByUserId(userId);
             Repositories.Contents.DeleteByUserId(userId);
             Repositories.Settings.DeleteByUserId(userId);
+            Repositories.LegacySettings.DeleteByUserId(userId);
             Repositories.Attachments.DeleteByUserId(userId);
             Repositories.Reminders.DeleteByUserId(userId);
             Repositories.Relations.DeleteByUserId(userId);