diff --git a/src/main.cpp b/src/main.cpp
index 5186b73..ccbbe43 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -182,7 +182,7 @@ void handle_serial_command(const String& cmd) {
             event.data1 = 36 + i;
             event.data2 = 64; // Medium velocity (yellow)
             controller.process_midi_event(event);
-            delay(200);
+            vTaskDelay(pdMS_TO_TICKS(200));
         }
         for (int i = 0; i < 10; i++) {
             MidiEvent event;
@@ -202,7 +202,7 @@ void handle_serial_command(const String& cmd) {
             event.data1 = i;
             event.data2 = 64;
             controller.process_midi_event(event);
-            delay(200);
+            vTaskDelay(pdMS_TO_TICKS(200));
         }
         for (int i = 0; i < 10; i++) {
             MidiEvent event;
@@ -222,7 +222,7 @@ void handle_serial_command(const String& cmd) {
             event.data1 = 36 + i;
             event.data2 = 64;
             controller.process_midi_event(event);
-            delay(200);
+            vTaskDelay(pdMS_TO_TICKS(200));
         }
         for (int i = 0; i < 10; i++) {
             MidiEvent event;
@@ -242,7 +242,7 @@ void handle_serial_command(const String& cmd) {
             event.data1 = 36 + i;
             event.data2 = 64;
             controller.process_midi_event(event);
-            delay(200);
+            vTaskDelay(pdMS_TO_TICKS(200));
         }
         for (int i = 0; i < 10; i++) {
             MidiEvent event;
@@ -262,7 +262,7 @@ void handle_serial_command(const String& cmd) {
             event.data1 = 36;
             event.data2 = v;
             controller.process_midi_event(event);
-            delay(100);
+            vTaskDelay(pdMS_TO_TICKS(100));
         }
         MidiEvent event;
         event.type = MidiEvent::NOTE_OFF;