diff --git a/apps/aomenc.c b/apps/aomenc.c
index d79e974..4930495 100644
--- a/apps/aomenc.c
+++ b/apps/aomenc.c
@@ -471,6 +471,7 @@
   &g_av1_codec_arg_defs.screen_detection_mode,
   &g_av1_codec_arg_defs.sharpness,
   &g_av1_codec_arg_defs.enable_adaptive_sharpness,
+  &g_av1_codec_arg_defs.validate_input_hbd,
   NULL,
 };
 
diff --git a/av1/arg_defs.c b/av1/arg_defs.c
index 5febc5a..d775ef9 100644
--- a/av1/arg_defs.c
+++ b/av1/arg_defs.c
@@ -721,5 +721,10 @@
       "Screen content detection mode (1: standard (default in good quality and "
       "realtime modes), 2: anti-aliased text and graphics aware (default in "
       "all intra mode))"),
+  .validate_input_hbd =
+      ARG_DEF(NULL, "validate-hbd-input", 1,
+              "Check that input samples are within the valid range "
+              "for the chosen bit depth with high bit depth encoding (0: "
+              "disabled, 1: enabled (default))"),
 #endif  // CONFIG_AV1_ENCODER
 };
diff --git a/av1/arg_defs.h b/av1/arg_defs.h
index eb3c2f3..16c5537 100644
--- a/av1/arg_defs.h
+++ b/av1/arg_defs.h
@@ -239,6 +239,7 @@
   arg_def_t sb_qp_sweep;
   arg_def_t enable_low_complexity_decode;
   arg_def_t screen_detection_mode;
+  arg_def_t validate_input_hbd;
 #endif  // CONFIG_AV1_ENCODER
 } av1_codec_arg_definitions_t;
 
diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c
index a814a75..fe0fe21 100644
--- a/av1/av1_cx_iface.c
+++ b/av1/av1_cx_iface.c
@@ -4847,6 +4847,9 @@
   } else if (arg_match_helper(&arg, &g_av1_codec_arg_defs.screen_detection_mode,
                               argv, err_string)) {
     extra_cfg.screen_detection_mode = arg_parse_int_helper(&arg, err_string);
+  } else if (arg_match_helper(&arg, &g_av1_codec_arg_defs.validate_input_hbd,
+                              argv, err_string)) {
+    extra_cfg.validate_input_hbd = arg_parse_int_helper(&arg, err_string);
   } else {
     match = 0;
     snprintf(err_string, ARG_ERR_MSG_MAX_LEN, "Cannot find aom option %s",