diff --git a/src/Arduboy2.cpp b/src/Arduboy2.cpp
index 7242116..414eaa7 100644
--- a/src/Arduboy2.cpp
+++ b/src/Arduboy2.cpp
@@ -61,10 +61,12 @@ void Arduboy2Base::flashlight()
   sendLCDCommand(OLED_ALL_PIXELS_ON); // smaller than allPixelsOn()
   digitalWriteRGB(RGB_ON, RGB_ON, RGB_ON);
 
+#ifndef ARDUBOY_CORE // for Arduboy core timer 0 should remain enabled
   // prevent the bootloader magic number from being overwritten by timer 0
   // when a timer variable overlaps the magic number location, for when
   // flashlight mode is used for upload problem recovery
   power_timer0_disable();
+#endif
 
   while (true) {
     idle();
diff --git a/src/Arduboy2Core.cpp b/src/Arduboy2Core.cpp
index 972185a..07c6b69 100644
--- a/src/Arduboy2Core.cpp
+++ b/src/Arduboy2Core.cpp
@@ -250,9 +250,11 @@ void Arduboy2Core::safeMode()
   {
     digitalWriteRGB(RED_LED, RGB_ON);
 
+#ifndef ARDUBOY_CORE // for Arduboy core timer 0 should remain enabled
     // prevent the bootloader magic number from being overwritten by timer 0
     // when a timer variable overlaps the magic number location
     power_timer0_disable();
+#endif
 
     while (true) { }
   }