diff --git a/Telegram/SourceFiles/ui/widgets/vertical_drum_picker.cpp b/Telegram/SourceFiles/ui/widgets/vertical_drum_picker.cpp
index 87950995a..9e546e004 100644
--- a/Telegram/SourceFiles/ui/widgets/vertical_drum_picker.cpp
+++ b/Telegram/SourceFiles/ui/widgets/vertical_drum_picker.cpp
@@ -12,8 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Ui {
 
-PickerAnimation::PickerAnimation() {
-}
+PickerAnimation::PickerAnimation() = default;
 
 void PickerAnimation::jumpToOffset(int offset) {
 	_result.from = _result.current;
@@ -95,8 +94,13 @@ VerticalDrumPicker::VerticalDrumPicker(
 	}, lifetime());
 
 	_animation.updates(
+	) | rpl::distinct_until_changed(
 	) | rpl::start_with_next([=](PickerAnimation::Shift shift) {
 		increaseShift(shift);
+		if (anim::Disabled()) {
+			animationDataFromIndex();
+			_animation.jumpToOffset(0);
+		}
 	}, lifetime());
 }