diff --git a/Assets/Scripts/MainRoom/UI/AvatarFaceManagement.cs b/Assets/Scripts/MainRoom/UI/AvatarFaceManagement.cs
index 5ff64aba0..480f203d0 100644
--- a/Assets/Scripts/MainRoom/UI/AvatarFaceManagement.cs
+++ b/Assets/Scripts/MainRoom/UI/AvatarFaceManagement.cs
@@ -87,6 +87,8 @@ void DeselectCurrentlySelected()
     // Invoke this Function when a FaceButton is Currently Selected & Favorites Face Button is Clicked
     public void AddToFavorites(AvatarFaceButton avatarFaceButton)
     {
+        if (_currentlySelectedButton == null) return;
+
         int index = IsAdded(avatarFaceButton);
 
         // If a button is selected and is NOT added to favorites