diff --git a/be/src/runtime/datetime-iso-sql-format-parser.cc b/be/src/runtime/datetime-iso-sql-format-parser.cc
index dae2b99..bd7fb5e 100644
--- a/be/src/runtime/datetime-iso-sql-format-parser.cc
+++ b/be/src/runtime/datetime-iso-sql-format-parser.cc
@@ -175,7 +175,7 @@
       case TIMEZONE_HOUR: {
         // Deliberately ignore the timezone offsets.
         int dummy_result;
-        if (!ParseAndValidate(current_pos, token_len, -99, 99, &dummy_result)) {
+        if (!ParseAndValidate(current_pos, token_len, -15, 15, &dummy_result)) {
           return false;
         }
         break;
@@ -183,7 +183,7 @@
       case TIMEZONE_MIN: {
         // Deliberately ignore the timezone offsets.
         int dummy_result;
-        if (!ParseAndValidate(current_pos, token_len, 0, 99, &dummy_result)) {
+        if (!ParseAndValidate(current_pos, token_len, 0, 59, &dummy_result)) {
           return false;
         }
         break;
diff --git a/tests/query_test/test_cast_with_format.py b/tests/query_test/test_cast_with_format.py
index bd1b069..7cbae34 100644
--- a/tests/query_test/test_cast_with_format.py
+++ b/tests/query_test/test_cast_with_format.py
@@ -1097,6 +1097,23 @@
         "timestamp FORMAT 'YYYY-MM-DD HH12:MI A.M.TZH:TZM')")
     assert result.data == ["2018-12-31 08:00:00"]
 
+    # Invalid TZH and TZM
+    result = self.client.execute("select cast('2016-01-01 10:00 AM +16:00' as "
+        "timestamp FORMAT 'YYYY-MM-DD HH12:MI A.M. TZH:TZM')")
+    assert result.data == ["NULL"]
+
+    result = self.client.execute("select cast('2016-01-01 11:00 AM -16:00' as "
+        "timestamp FORMAT 'YYYY-MM-DD HH12:MI A.M. TZH:TZM')")
+    assert result.data == ["NULL"]
+
+    result = self.client.execute("select cast('2016-01-01 10:00 AM 16:00' as "
+        "timestamp FORMAT 'YYYY-MM-DD HH12:MI A.M. TZH:TZM')")
+    assert result.data == ["NULL"]
+
+    result = self.client.execute("select cast('2016-01-01 10:00 AM +15:60' as "
+        "timestamp FORMAT 'YYYY-MM-DD HH12:MI A.M. TZH:TZM')")
+    assert result.data == ["NULL"]
+
     # One digit negative TZH at the end of the input string.
     result = self.client.execute("select cast('2018-12-31 12:01 -1' as timestamp "
         "FORMAT 'YYYY-MM-DD HH24:MI TZH')")