diff --git a/src/ayab/beeper.h b/src/ayab/beeper.h
index 33e7275de..4b1e23183 100644
--- a/src/ayab/beeper.h
+++ b/src/ayab/beeper.h
@@ -28,7 +28,7 @@
 
 enum class BeepState : unsigned char {Idle, Wait, On, Off};
 
-constexpr unsigned int BEEP_DELAY = 0U; // ms
+constexpr unsigned int BEEP_DELAY = 50U; // ms
 
 constexpr uint8_t BEEP_NUM_READY = 5U;
 constexpr uint8_t BEEP_NUM_FINISHEDLINE = 3U;
diff --git a/test/test_beeper.cpp b/test/test_beeper.cpp
index ef3fa551d..cace6daff 100644
--- a/test/test_beeper.cpp
+++ b/test/test_beeper.cpp
@@ -52,15 +52,18 @@ class BeeperTest : public ::testing::Test {
       ASSERT_EQ(beeper->getState(), BeepState::Wait);
       for (uint8_t i = 0; i < repeats; i++) {
         expectedBeepSchedule(BEEP_DELAY * 2 * i);
+        ASSERT_EQ(beeper->getState(), BeepState::On);
         EXPECT_CALL(*arduinoMock, analogWrite(PIEZO_PIN, BEEP_ON_DUTY));
-        expectedBeepSchedule(BEEP_DELAY * 2 * i + 1);
+        expectedBeepSchedule(BEEP_DELAY * 2 * i);
+        ASSERT_EQ(beeper->getState(), BeepState::Wait);
         expectedBeepSchedule(BEEP_DELAY * (2 * i + 1));
+        ASSERT_EQ(beeper->getState(), BeepState::Off);
         EXPECT_CALL(*arduinoMock, analogWrite(PIEZO_PIN, BEEP_OFF_DUTY));
-        expectedBeepSchedule(BEEP_DELAY * (2 * i + 1) + 1);
+        expectedBeepSchedule(BEEP_DELAY * (2 * i + 1));
+        ASSERT_EQ(beeper->getState(), BeepState::Wait);
       }
-      expectedBeepSchedule(BEEP_DELAY * (2 * repeats));
       EXPECT_CALL(*arduinoMock, analogWrite(PIEZO_PIN, BEEP_NO_DUTY));
-      expectedBeepSchedule(BEEP_DELAY * (2 * repeats) + 1);
+      expectedBeepSchedule(BEEP_DELAY * (2 * repeats));
     }
     ASSERT_EQ(beeper->getState(), BeepState::Idle);
   }