diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 0c7b4042..50860014 100755
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1832,14 +1832,14 @@
 
 // Play a (non-earpiercing) startup chime on startup/serial connection
 // of the Trigorilla board
-//#define STARTUP_CHIME
+#define STARTUP_CHIME
 
 //
 // ENDSTOP BEEP
 //
 // Short 2KHz beep when endstops are hit
 //
-//#define ENDSTOP_BEEP
+#define ENDSTOP_BEEP
 
 //
 // The duration and frequency for the UI feedback sound.
diff --git a/Marlin/src/lcd/anycubic_touchscreen.cpp b/Marlin/src/lcd/anycubic_touchscreen.cpp
index 2196cf2f..da7ff599 100755
--- a/Marlin/src/lcd/anycubic_touchscreen.cpp
+++ b/Marlin/src/lcd/anycubic_touchscreen.cpp
@@ -141,10 +141,9 @@ void AnycubicTouchscreenClass::Setup()
   FilamentSensorEnabled = true;
 
 #ifdef STARTUP_CHIME
-  buzzer.tone(250, 554); // C#5
-  buzzer.tone(250, 740); // F#5
-  buzzer.tone(250, 554); // C#5
-  buzzer.tone(500, 831); // G#5
+  buzzer.tone(100, 554);
+  buzzer.tone(100, 740);
+  buzzer.tone(100, 831);
 #endif
 
 
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index e3478e2b..f2915d75 100755
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -2071,22 +2071,11 @@ void Temperature::init() {
 
       case TRRunaway:
         _temp_error(heater_id, str_t_thermal_runaway, GET_TEXT(MSG_THERMAL_RUNAWAY));
-        BUZZ(2000, 1108);
-        BUZZ(2000, 1661);
-        BUZZ(2000, 1108);
-        BUZZ(2000, 1661);
-        BUZZ(2000, 1108);
-        BUZZ(2000, 1661);
-        BUZZ(2000, 1108);
-        BUZZ(2000, 1661);
-        BUZZ(2000, 1108);
-        BUZZ(2000, 1661);
-        BUZZ(2000, 1108);
-        BUZZ(2000, 1661);
-        BUZZ(2000, 1108);
-        BUZZ(2000, 1661);
-        BUZZ(2000, 1108);
-        BUZZ(2000, 1661);
+        for(uint8_t i = 0; i < 30; i++)
+        {
+          BUZZ(2000, 1108);
+          BUZZ(2000, 1661);
+        }
     }
   }
 
diff --git a/config/default/Configuration.h b/config/default/Configuration.h
index 07ae7e59..84f26639 100755
--- a/config/default/Configuration.h
+++ b/config/default/Configuration.h
@@ -1718,7 +1718,7 @@
 //
 // Short 2KHz beep when endstops are hit
 //
-//#define ENDSTOP_BEEP
+#define ENDSTOP_BEEP
 
 //
 // The duration and frequency for the UI feedback sound.