diff --git a/components/character/CharacterModal/index.tsx b/components/character/CharacterModal/index.tsx
index edfc961f..59e65c87 100644
--- a/components/character/CharacterModal/index.tsx
+++ b/components/character/CharacterModal/index.tsx
@@ -249,6 +249,19 @@ const CharacterModal = ({
   }
 
   function close() {
+    setEarring({
+      modifier: gridCharacter.aetherial_mastery
+        ? gridCharacter.aetherial_mastery.modifier
+        : 0,
+      strength: gridCharacter.aetherial_mastery
+        ? gridCharacter.aetherial_mastery.strength
+        : 0,
+    })
+
+    setRings(gridCharacter.over_mastery || emptyExtendedMastery)
+    setAwakening(gridCharacter.awakening.type)
+    setAwakeningLevel(gridCharacter.awakening.level)
+
     setAlertOpen(false)
     setOpen(false)
     onOpenChange(false)
diff --git a/components/mastery/AwakeningSelectWithInput/index.tsx b/components/mastery/AwakeningSelectWithInput/index.tsx
index 7f8c17d6..7ce1956c 100644
--- a/components/mastery/AwakeningSelectWithInput/index.tsx
+++ b/components/mastery/AwakeningSelectWithInput/index.tsx
@@ -133,7 +133,6 @@ const AwakeningSelectWithInput = ({
   }
 
   // Methods: Handle error
-
   function handleInputError(value: number) {
     let error = ''
 
@@ -211,7 +210,6 @@ const AwakeningSelectWithInput = ({
           max={maxLevel}
           step="1"
           onChange={handleInputChange}
-          visible={awakening ? 'true' : 'false'}
           ref={inputRef}
         />
       </div>