diff --git a/src/Power.cpp b/src/Power.cpp
index feb7930ad..20b875137 100644
--- a/src/Power.cpp
+++ b/src/Power.cpp
@@ -211,8 +211,12 @@ void Power::shutdown()
 {
 #ifdef TBEAM_V10
     DEBUG_MSG("Shutting down\n");
+    axp.setChgLEDMode(AXP20X_LED_OFF);
     axp.shutdown();
 #elif NRF52_SERIES
+    playBeep();
+    ledOff(PIN_LED1);
+    ledOff(PIN_LED2);
     doDeepSleep(DELAY_FOREVER);
 #endif
 }
diff --git a/src/shutdown.h b/src/shutdown.h
index 3b703331d..57cd1b691 100644
--- a/src/shutdown.h
+++ b/src/shutdown.h
@@ -30,7 +30,7 @@ void powerCommandsCheck()
         DEBUG_MSG("Shutting down from admin command\n");
 #ifdef TBEAM_V10
         if (axp192_found == true) {
-            // setLed(false); //TODO: FIXME: this is not working
+            playShutdownMelody();
             power->shutdown();
         }
 #elif NRF52_SERIES