diff --git a/src/drivers/echo_adc/echo_adc.h b/src/drivers/echo_adc/echo_adc.h
index 213e3a9..82ba6f9 100644
--- a/src/drivers/echo_adc/echo_adc.h
+++ b/src/drivers/echo_adc/echo_adc.h
@@ -8,7 +8,7 @@
 
 #include <stdint.h>
 
-#define ECHO_ADC_MAX_SAMPLES  100
+#define ECHO_ADC_MAX_SAMPLES  117
 
 int echo_adc_init(void);
 int echo_adc_wake(void);
diff --git a/src/parser.c b/src/parser.c
index 9827f84..fc1d1dc 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -45,6 +45,8 @@
 #define PIEZO_CFG_AVG_DEFAULT        3
 
 #define PIEZO_CFG_AVG_MAX            10
+#define PIEZO_CFG_SAMPLES_MIN        80
+#define PIEZO_CFG_SAMPLES_MAX        117
 #define PIEZO_CFG_DELAY_MAX_US       50
 #define PIEZO_POST_SELECT_SETTLE_US  500
 #define PIEZO_AVG_INTER_BURST_GAP_US 500
@@ -98,7 +100,8 @@ static bool piezo_config_validate(const piezo_config_t *cfg)
         return false;
     }
 
-    if ((cfg->samples == 0U) || (cfg->samples > ECHO_ADC_MAX_SAMPLES))
+    if ((cfg->samples < PIEZO_CFG_SAMPLES_MIN) ||
+        (cfg->samples > PIEZO_CFG_SAMPLES_MAX))
     {
         return false;
     }