diff --git a/UI.hpp b/UI.hpp
index e1d08af..bea5a41 100644
--- a/UI.hpp
+++ b/UI.hpp
@@ -2226,13 +2226,16 @@ void set_chorus_delay(uint8_t value)
 {
   if (value > ENC_CHORUS_DELAY_MAX)
     value = ENC_CHORUS_DELAY_MAX;
+  else if (value < ENC_CHORUS_DELAY_MIN)
+    value = ENC_CHORUS_DELAY_MIN;
 #ifdef SHOW_DEBUG
   Serial.print(F("Set CHORUS_DELAY "));
   Serial.print(value);
-  Serial.print(F("/"));
+  Serial.print(F(" ("));
   Serial.print(float(value) / 10);
-  Serial.print(F("/"));
+  Serial.print(F(" ms / "));
   Serial.print(uint16_t(TIME_MS2SAMPLES(float(value) / 10)));
+  Serial.print(F(" samples)"));
   Serial.println();
 #endif
   modchorus_r.offset(TIME_MS2SAMPLES(float(value) / 10));
diff --git a/config.h b/config.h
index f1efbab..2c9d50e 100644
--- a/config.h
+++ b/config.h
@@ -240,7 +240,9 @@
 //
 #define ENC_CHORUS_DELAY_MIN uint8_t(SAMPLES2TIME_MS(MOD_DELAY_SAMPLE_BUFFER>>2)*10+0.5)
 #define ENC_CHORUS_DELAY_MAX uint8_t(SAMPLES2TIME_MS(MOD_DELAY_SAMPLE_BUFFER>>2)*30+0.5)
-#define ENC_CHORUS_DELAY_DEFAULT uint8_t(SAMPLES2TIME_MS(MOD_DELAY_SAMPLE_BUFFER>>2)*20+0.5)
+//#define ENC_CHORUS_DELAY_DEFAULT uint8_t(SAMPLES2TIME_MS(MOD_DELAY_SAMPLE_BUFFER>>2)*20+0.5)
+#define ENC_CHORUS_DELAY_DEFAULT 0
+
 //
 #define ENC_CHORUS_INTENSITY_MIN 0
 #define ENC_CHORUS_INTENSITY_MAX 100