diff --git a/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/register/RecordRegisterPresenter.kt b/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/register/RecordRegisterPresenter.kt
index 830679b8..148d27e2 100644
--- a/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/register/RecordRegisterPresenter.kt
+++ b/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/register/RecordRegisterPresenter.kt
@@ -270,6 +270,14 @@ class RecordRegisterPresenter(
                 }
 
                 is RecordRegisterUiEvent.OnEmotionDetailBottomSheetDismiss -> {
+                    if (committedEmotionCode == null) {
+                        selectedEmotionCode = null
+                        selectedEmotionMap = persistentMapOf()
+                    } else {
+                        selectedEmotionCode = committedEmotionCode
+                        selectedEmotionMap = committedEmotionMap
+                    }
+
                     isEmotionDetailBottomSheetVisible = false
                 }