diff --git a/projects/ucap-webmessenger-ui/src/lib/components/pick-time.component.ts b/projects/ucap-webmessenger-ui/src/lib/components/pick-time.component.ts
index f6ac40c5..ccbf267d 100644
--- a/projects/ucap-webmessenger-ui/src/lib/components/pick-time.component.ts
+++ b/projects/ucap-webmessenger-ui/src/lib/components/pick-time.component.ts
@@ -42,6 +42,9 @@ export class PickTimeComponent implements OnInit {
     this.hourSelected.emit(hour);
   }
   onChangedMinute(minute: number) {
+    if (!!minute && minute === 60) {
+      minute = minute - this.minuteStep;
+    }
     this.minuteSelected.emit(minute);
   }
 }
diff --git a/projects/ucap-webmessenger-ui/src/lib/components/step-input.component.html b/projects/ucap-webmessenger-ui/src/lib/components/step-input.component.html
index 823f0ece..944b9758 100644
--- a/projects/ucap-webmessenger-ui/src/lib/components/step-input.component.html
+++ b/projects/ucap-webmessenger-ui/src/lib/components/step-input.component.html
@@ -6,6 +6,7 @@
     matInput
     #input
     class="stepper-input"
+    readonly
     [attr.maxlength]="maxLength"
     [attr.placeholder]="placeholder"
     [attr.disabled]="disabled"