diff --git a/orb-ui/src/engine/diamond.rs b/orb-ui/src/engine/diamond.rs
index 39d652d3..d56a9b8d 100644
--- a/orb-ui/src/engine/diamond.rs
+++ b/orb-ui/src/engine/diamond.rs
@@ -208,8 +208,6 @@ impl EventHandler for Runner<DIAMOND_RING_LED_COUNT, DIAMOND_CENTER_LED_COUNT> {
         tracing::info!("UI event: {:?}", event);
         match event {
             Event::Bootup => {
-                self.sound
-                    .queue(sound::Type::Melody(sound::Melody::BootUp))?;
                 self.stop_ring(LEVEL_NOTICE, true);
                 self.stop_center(LEVEL_NOTICE, true);
                 self.stop_cone(LEVEL_NOTICE, true);
@@ -219,7 +217,11 @@ impl EventHandler for Runner<DIAMOND_RING_LED_COUNT, DIAMOND_CENTER_LED_COUNT> {
                 );
                 self.operator_pulse.trigger(2048.0, 1., 1., false);
             }
-            Event::BootComplete => self.operator_pulse.stop(),
+            Event::BootComplete => {
+                self.sound
+                    .queue(sound::Type::Melody(sound::Melody::BootUp))?;
+                self.operator_pulse.stop()
+            }
             Event::Shutdown { requested } => {
                 self.sound
                     .queue(sound::Type::Melody(sound::Melody::PoweringDown))?;
diff --git a/orb-ui/src/engine/pearl.rs b/orb-ui/src/engine/pearl.rs
index 573ad69f..6d6cf3fc 100644
--- a/orb-ui/src/engine/pearl.rs
+++ b/orb-ui/src/engine/pearl.rs
@@ -187,8 +187,6 @@ impl EventHandler for Runner<PEARL_RING_LED_COUNT, PEARL_CENTER_LED_COUNT> {
         tracing::info!("UI event: {:?}", event);
         match event {
             Event::Bootup => {
-                self.sound
-                    .queue(sound::Type::Melody(sound::Melody::BootUp))?;
                 self.stop_ring(LEVEL_NOTICE, true);
                 self.stop_center(LEVEL_NOTICE, true);
                 self.set_ring(
@@ -197,7 +195,11 @@ impl EventHandler for Runner<PEARL_RING_LED_COUNT, PEARL_CENTER_LED_COUNT> {
                 );
                 self.operator_pulse.trigger(2048.0, 1., 1., false);
             }
-            Event::BootComplete => self.operator_pulse.stop(),
+            Event::BootComplete => {
+                self.sound
+                    .queue(sound::Type::Melody(sound::Melody::BootUp))?;
+                self.operator_pulse.stop()
+            }
             Event::Shutdown { requested } => {
                 self.sound
                     .queue(sound::Type::Melody(sound::Melody::PoweringDown))?;