diff --git a/lib/java/com/google/android/material/timepicker/TimeModel.java b/lib/java/com/google/android/material/timepicker/TimeModel.java
index bd03b12d4e8..a2064e64ca0 100644
--- a/lib/java/com/google/android/material/timepicker/TimeModel.java
+++ b/lib/java/com/google/android/material/timepicker/TimeModel.java
@@ -66,7 +66,7 @@ public TimeModel(int hour, int minute, @ActiveSelection int selection, @TimeForm
     this.format = format;
     period = getPeriod(hour);
     minuteInputValidator = new MaxInputValidator(59);
-    hourInputValidator = new MaxInputValidator(format == CLOCK_24H ? 24 : 12);
+    hourInputValidator = new MaxInputValidator(format == CLOCK_24H ? 23 : 12);
   }
 
   protected TimeModel(Parcel in) {
diff --git a/lib/javatests/com/google/android/material/timepicker/TimeModelTest.java b/lib/javatests/com/google/android/material/timepicker/TimeModelTest.java
index 081141b9fb8..bd985e98bd8 100644
--- a/lib/javatests/com/google/android/material/timepicker/TimeModelTest.java
+++ b/lib/javatests/com/google/android/material/timepicker/TimeModelTest.java
@@ -43,7 +43,7 @@ public void with12HFormat_hasCorrectValidators() {
   public void with24HFormat_hasCorrectValidators() {
     TimeModel timeModel = new TimeModel(CLOCK_24H);
 
-    assertThat(timeModel.getHourInputValidator().getMax()).isEqualTo(24);
+    assertThat(timeModel.getHourInputValidator().getMax()).isEqualTo(23);
     assertThat(timeModel.getMinuteInputValidator().getMax()).isEqualTo(59);
   }