diff --git a/Memento-iOS/Memento-iOS/Source/Presentation/Add/Common/PickerButton/ViewModel/PickerButtonViewModel.swift b/Memento-iOS/Memento-iOS/Source/Presentation/Add/Common/PickerButton/ViewModel/PickerButtonViewModel.swift
index 2cbcdcf..f216676 100644
--- a/Memento-iOS/Memento-iOS/Source/Presentation/Add/Common/PickerButton/ViewModel/PickerButtonViewModel.swift
+++ b/Memento-iOS/Memento-iOS/Source/Presentation/Add/Common/PickerButton/ViewModel/PickerButtonViewModel.swift
@@ -131,11 +131,13 @@ final class PickerButtonViewModel: BasePickerViewModel {
     }
 
     func updateRepeatType(_ type: RepeatType) {
-        repeatType = type
-        shouldShowEndRepeat = type != .none
-        if type == .none {
-            endRepeatDate = nil
-            isEndRepeatDateSelected = false
+        if repeatType != type {
+            repeatType = type
+            shouldShowEndRepeat = type != .none
+            if type == .none {
+                endRepeatDate = nil
+                isEndRepeatDateSelected = false
+            }
         }
     }