diff --git a/src/beeper.h b/src/beeper.h
index 3583a0776..b7acfc5f4 100644
--- a/src/beeper.h
+++ b/src/beeper.h
@@ -84,6 +84,7 @@ extern void beep(uint8_t val);
 #define AUDIO_PLAY(p)         beep(3)
 
 #define IS_AUDIO_BUSY() (g_beepCnt || beepAgain || beepOn)
+#define AUDIO_RESET()
 
 #if !defined(PCBSKY9X)
 FORCEINLINE void AUDIO_HEARTBEAT()
diff --git a/src/eeprom_arm.cpp b/src/eeprom_arm.cpp
index 747a1b5b6..40b7fca2a 100644
--- a/src/eeprom_arm.cpp
+++ b/src/eeprom_arm.cpp
@@ -498,6 +498,8 @@ void eeLoadModel(uint8_t id)
       read32_eeprom_data( ( File_system[id+1].block_no << 12) + sizeof( struct t_eeprom_header), ( uint8_t *)&g_model, size) ;
     }
 
+    resetAll();
+
     if (pulsesStarted()) {
       checkTHR();
       checkSwitches();
@@ -509,7 +511,6 @@ void eeLoadModel(uint8_t id)
     activeFunctionSwitches = 0;
 
     resetProto();
-    resetAll();
 
     for (uint8_t i=0; i<MAX_TIMERS; i++) {
       if (g_model.timersXtra[i].remanent) {
diff --git a/src/eeprom_avr.cpp b/src/eeprom_avr.cpp
index ff45ccc72..4d2decf8c 100644
--- a/src/eeprom_avr.cpp
+++ b/src/eeprom_avr.cpp
@@ -868,6 +868,8 @@ void eeLoadModel(uint8_t id)
       eeCheck(true);
     }
 
+    resetAll();
+
     if (pulsesStarted()) {
       checkAll();
       resumePulses();
@@ -878,7 +880,6 @@ void eeLoadModel(uint8_t id)
     activeFunctionSwitches = 0;
 
     resetProto();
-    resetAll();
 
 #if defined(PCBGRUVIN9X)
     for (uint8_t i=0; i<MAX_TIMERS; i++) {
diff --git a/src/general_menus.cpp b/src/general_menus.cpp
index 330baff95..ec619129f 100644
--- a/src/general_menus.cpp
+++ b/src/general_menus.cpp
@@ -422,10 +422,6 @@ void menuGeneralSetup(uint8_t event)
   }
 }
 
-#if defined(PCBSKY9X)
-extern uint32_t sdAvailableAudioFiles; // TODO move that!
-#endif
-
 #if defined(SDCARD)
 void menuGeneralSdManagerInfo(uint8_t event)
 {
@@ -650,10 +646,12 @@ void menuGeneralSdManager(uint8_t event)
       }
       else if (result == STR_SD_FORMAT) {
         displayPopup(STR_FORMATTING);
-        if (f_mkfs(0, 1, 0) == FR_OK) {
+        closeLogs();
 #if defined(PCBSKY9X)
-          sdAvailableAudioFiles = 0;
+        Card_state = SD_ST_DATA;
+        audioQueue.stopSD();
 #endif
+        if (f_mkfs(0, 1, 0) == FR_OK) {
           f_chdir("/");
           reusableBuffer.sd.offset = -1;
         }
diff --git a/src/open9x.cpp b/src/open9x.cpp
index cb8e23131..27469cd1c 100644
--- a/src/open9x.cpp
+++ b/src/open9x.cpp
@@ -1557,14 +1557,20 @@ void resetTimer(uint8_t idx)
 
 void resetAll()
 {
-  // TODO s_traceCnt to be reset?
+  AUDIO_RESET();
+
   resetTimer(0);
   resetTimer(1);
-#ifdef FRSKY
+#if defined(FRSKY)
   resetTelemetry();
 #endif
   for (uint8_t i=0; i<NUM_CSW; i++)
     csLastValue[i] = -32668;
+
+#if defined(THRTRACE)
+  s_traceCnt = 0;
+  s_traceWr = 0;
+#endif
 }
 
 static uint8_t lastSwPos[2] = {0, 0};
diff --git a/src/sky9x/audio.cpp b/src/sky9x/audio.cpp
index ddc2500c2..257908a14 100644
--- a/src/sky9x/audio.cpp
+++ b/src/sky9x/audio.cpp
@@ -527,15 +527,21 @@ void AudioQueue::stopPlay(uint8_t id)
 void AudioQueue::stopSD()
 {
   sdAvailableAudioFiles = 0;
-
-  CoEnterMutexSection(audioMutex);
-  widx = ridx;                      // clean the queue
-  CoLeaveMutexSection(audioMutex);
-
+  reset();
   play(0, 0, 100, PLAY_NOW);        // insert a 100ms pause
 }
+
 #endif
 
+void AudioQueue::reset()
+{
+  CoEnterMutexSection(audioMutex);
+  widx = ridx;                      // clean the queue
+  memset(&currentContext.fragment, 0, sizeof(AudioFragment));
+  memset(&backgroundContext.fragment, 0, sizeof(AudioFragment));
+  CoLeaveMutexSection(audioMutex);
+}
+
 void audioEvent(uint8_t e, uint8_t f)
 {
 #ifdef SDCARD
diff --git a/src/sky9x/audio.h b/src/sky9x/audio.h
index d2f7fe0d2..dac2cb361 100644
--- a/src/sky9x/audio.h
+++ b/src/sky9x/audio.h
@@ -111,6 +111,8 @@ class AudioQueue {
       return ridx == widx;
     }
 
+    void reset();
+
   protected:
 
     void wakeup();
@@ -178,5 +180,6 @@ extern void pushPrompt(uint16_t prompt, uint8_t id=0);
 #define PLAY_VALUE(v, id) playValue((v), (id))
 #define PLAY_FILE(f, flags, id) audioQueue.playFile((f), (flags), (id))
 #define STOP_PLAY(id) audioQueue.stopPlay((id))
+#define AUDIO_RESET() audioQueue.reset()
 
 #endif
diff --git a/src/sky9x/diskio.cpp b/src/sky9x/diskio.cpp
index c4bbb96ba..d3f99908f 100644
--- a/src/sky9x/diskio.cpp
+++ b/src/sky9x/diskio.cpp
@@ -489,7 +489,7 @@ const char * sdCmd9()
 #define SDMMC_SELECT_CARD       (7 | HSMCI_CMDR_TRCMD_NO_DATA \
                                    | HSMCI_CMDR_SPCMD_STD \
                                    | HSMCI_CMDR_RSPTYP_R1B \
-                                   | HSMCI_CMDR_MAXLAT /* TODO not the same */ )
+                                   | HSMCI_CMDR_MAXLAT )
 
 const char * sdCmd7()
 {
@@ -1362,8 +1362,6 @@ DRESULT disk_write (
 
         if ( sd_card_ready() == 0 ) return RES_NOTRDY;
 
-        // TODO if (Stat & STA_PROTECT) return RES_WRPRT;
-
         do {
 
           while  (1) {
diff --git a/src/stock/audio.h b/src/stock/audio.h
index cfbc6f211..70e92bfce 100644
--- a/src/stock/audio.h
+++ b/src/stock/audio.h
@@ -149,4 +149,4 @@ void audioDefevent(uint8_t e);
 #define AUDIO_DRIVER()      audio.driver()
 #define AUDIO_HEARTBEAT()   audio.heartbeat()
 #define IS_AUDIO_BUSY()     audio.busy()
-
+#define AUDIO_RESET()