diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Cultivation/CultivationService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Cultivation/CultivationService.cs
index 6f49ac41..10951cf2 100644
--- a/src/Snap.Hutao/Snap.Hutao/Service/Cultivation/CultivationService.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Service/Cultivation/CultivationService.cs
@@ -133,7 +133,9 @@ internal sealed partial class CultivationService : ICultivationService
         }
 
         await taskContext.SwitchToBackgroundAsync();
-        CultivateEntry? entry = cultivationDbService.GetCultivateEntryByProjectIdAndItemId(Projects.CurrentItem.InnerId, itemId);
+        CultivateEntry? entry = type is CultivateType.AvatarAndSkill
+            ? cultivationDbService.GetCultivateEntryByProjectIdAndItemId(Projects.CurrentItem.InnerId, itemId)
+            : default;
 
         if (entry is null)
         {
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/AvatarPropertyViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/AvatarPropertyViewModel.cs
index 4da123a3..7f0c0de0 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/AvatarPropertyViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/AvatarPropertyViewModel.cs
@@ -122,6 +122,7 @@ internal sealed partial class AvatarPropertyViewModel : Abstraction.ViewModel, I
     {
         try
         {
+            await taskContext.SwitchToMainThreadAsync();
             IsInitialized = false;
             ValueResult<RefreshResultKind, Summary?> summaryResult;
             using (await EnterCriticalSectionAsync().ConfigureAwait(false))
@@ -169,6 +170,7 @@ internal sealed partial class AvatarPropertyViewModel : Abstraction.ViewModel, I
         }
         finally
         {
+            await taskContext.SwitchToMainThreadAsync();
             IsInitialized = true;
         }
     }