diff --git a/ReModCE/Components/AvatarFavoritesComponent.cs b/ReModCE/Components/AvatarFavoritesComponent.cs
index 50d8088..93f1b20 100644
--- a/ReModCE/Components/AvatarFavoritesComponent.cs
+++ b/ReModCE/Components/AvatarFavoritesComponent.cs
@@ -3,10 +3,12 @@
 using System.IO;
 using System.Linq;
 using ReModCE.Core;
+using ReModCE.Loader;
 using ReModCE.Managers;
 using ReModCE.UI;
 using ReModCE.VRChat;
 using UnityEngine;
+using UnityEngine.UI;
 using VRC.Core;
 using VRC.SDKBase.Validation.Performance.Stats;
 using AvatarList = Il2CppSystem.Collections.Generic.List<VRC.Core.ApiAvatar>;
@@ -20,6 +22,8 @@ internal class AvatarFavoritesComponent : ModComponent, IAvatarListOwner
 
         private readonly List<ReAvatar> _savedAvatars;
 
+        private Button.ButtonClickedEvent _changeButtonEvent;
+
         public AvatarFavoritesComponent()
         {
             if (File.Exists("UserData/ReModCE/avatars.bin"))
@@ -40,6 +44,44 @@ public override void OnUiManagerInit(UiManager uiManager)
             _favoriteButton = new ReUiButton("Favorite", new Vector2(-600f, 375f), new Vector2(0.5f, 1f), () => FavoriteAvatar(_avatarList.AvatarPedestal.field_Internal_ApiAvatar_0),
                 GameObject.Find("UserInterface/MenuContent/Screens/Avatar/Favorite Button").transform.parent);
 
+            var changeButton = GameObject.Find("UserInterface/MenuContent/Screens/Avatar/Change Button");
+            if (changeButton != null)
+            {
+                var button = changeButton.GetComponent<Button>();
+                _changeButtonEvent = button.onClick;
+
+                button.onClick = new Button.ButtonClickedEvent();
+                button.onClick.AddListener(new Action(() =>
+                {
+                    var currentAvatar = _avatarList.AvatarPedestal.field_Internal_ApiAvatar_0;
+                    if (!HasAvatarFavorited(currentAvatar.id)) // this isn't in our list. we don't care about it
+                    {
+                        _changeButtonEvent.Invoke();
+                        return;
+                    }
+                    
+                    new ApiAvatar { id = currentAvatar.id }.Fetch(new Action<ApiContainer>(ac =>
+                    {
+                        var updatedAvatar = ac.Model.Cast<ApiAvatar>();
+                        switch (updatedAvatar.releaseStatus)
+                        {
+                            case "private" when updatedAvatar.authorId != APIUser.CurrentUser.id:
+                                VRCUiPopupManager.prop_VRCUiPopupManager_0.ShowAlert("ReMod CE", "This avatar is private and you don't own it. You can't switch into it.");
+                                break;
+                            case "unavailable":
+                                VRCUiPopupManager.prop_VRCUiPopupManager_0.ShowAlert("ReMod CE", "This avatar has been deleted. You can't switch into it.");
+                                break;
+                            default:
+                                _changeButtonEvent.Invoke();
+                                break;
+                        }
+                    }), new Action<ApiContainer>(ac =>
+                    {
+                        VRCUiPopupManager.prop_VRCUiPopupManager_0.ShowAlert("ReMod CE", "This avatar has been deleted. You can't switch into it.");
+                    }));
+                }));
+            }
+
             if (uiManager.IsRemodLoaded)
             {
                 _favoriteButton.Position += new Vector3(UiManager.ButtonSize, 0f);
diff --git a/ReModCE/Components/AvatarHistoryComponent.cs b/ReModCE/Components/AvatarHistoryComponent.cs
index 587c422..6f38fc7 100644
--- a/ReModCE/Components/AvatarHistoryComponent.cs
+++ b/ReModCE/Components/AvatarHistoryComponent.cs
@@ -18,6 +18,7 @@ internal class AvatarHistoryComponent : ModComponent, IAvatarListOwner
         private ReAvatarList _avatarList;
         private readonly List<ReAvatar> _recentAvatars;
 
+        private Button.ButtonClickedEvent _changeButtonEvent;
         public AvatarHistoryComponent()
         {
             if (File.Exists("UserData/ReModCE/recent_avatars.bin"))
@@ -36,7 +37,46 @@ public override void OnUiManagerInit(UiManager uiManager)
             _avatarList = new ReAvatarList("Recently Used", this, false);
 
             var changeButton = GameObject.Find("UserInterface/MenuContent/Screens/Avatar/Change Button");
-            changeButton.GetComponent<Button>().onClick.AddListener(new Action(OnChangeAvatar));
+            
+            if (changeButton != null)
+            {
+                var button = changeButton.GetComponent<Button>();
+                _changeButtonEvent = button.onClick;
+
+                button.onClick = new Button.ButtonClickedEvent();
+                button.onClick.AddListener(new Action(() =>
+                {
+                    var currentAvatar = _avatarList.AvatarPedestal.field_Internal_ApiAvatar_0;
+                    if (!IsAvatarInHistory(currentAvatar.id)) // this isn't in our list. we don't care about it
+                    {
+                        _changeButtonEvent.Invoke();
+                        return;
+                    }
+
+                    new ApiAvatar { id = currentAvatar.id }.Fetch(new Action<ApiContainer>(ac =>
+                    {
+                        var updatedAvatar = ac.Model.Cast<ApiAvatar>();
+                        switch (updatedAvatar.releaseStatus)
+                        {
+                            case "private" when updatedAvatar.authorId != APIUser.CurrentUser.id:
+                                VRCUiPopupManager.prop_VRCUiPopupManager_0.ShowAlert("ReMod CE", "This avatar is private and you don't own it. You can't switch into it.");
+                                break;
+                            case "unavailable":
+                                VRCUiPopupManager.prop_VRCUiPopupManager_0.ShowAlert("ReMod CE", "This avatar has been deleted. You can't switch into it.");
+                                _recentAvatars.RemoveAll(a => a.Id == currentAvatar.id);
+                                _avatarList.Refresh(GetAvatars());
+                                break;
+                            default:
+                                _changeButtonEvent.Invoke();
+                                break;
+                        }
+                    }), new Action<ApiContainer>(ac =>
+                    {
+                        VRCUiPopupManager.prop_VRCUiPopupManager_0.ShowAlert("ReMod CE", "This avatar has been deleted. You can't switch into it.");
+                        _recentAvatars.RemoveAll(a => a.Id == currentAvatar.id);
+                    }));
+                }));
+            }
         }
 
         public override void OnAvatarIsReady(VRCPlayer vrcPlayer)
@@ -47,9 +87,17 @@ public override void OnAvatarIsReady(VRCPlayer vrcPlayer)
             }
         }
 
+        private bool IsAvatarInHistory(string id)
+        {
+            return _recentAvatars.FirstOrDefault(a => a.Id == id) != null;
+        }
+
         private void AddAvatarToHistory(ApiAvatar avatar)
         {
-            if (_recentAvatars.FirstOrDefault(a => a.Id == avatar.id) != null)
+            if (avatar.IsLocal)
+                return;
+
+            if (IsAvatarInHistory(avatar.id))
             {
                 _recentAvatars.RemoveAll(a => a.Id == avatar.id);
             }