diff --git a/src/audio_arm.cpp b/src/audio_arm.cpp
index df5d3c334..db29f3f05 100644
--- a/src/audio_arm.cpp
+++ b/src/audio_arm.cpp
@@ -267,7 +267,7 @@ AudioQueue::AudioQueue()
 
 void AudioQueue::start()
 {
-  state = AUDIO_RESUMING;
+  state = AUDIO_SLEEPING;
   CoSetFlag(audioFlag);
 }
 
diff --git a/src/eeprom_avr.cpp b/src/eeprom_avr.cpp
index cf8a82f40..2b6b8e956 100644
--- a/src/eeprom_avr.cpp
+++ b/src/eeprom_avr.cpp
@@ -958,7 +958,9 @@ void eeReadAll()
   }
 
   stickMode = g_eeGeneral.stickMode;
+#if !defined(CPUARM)
   eeLoadModel(g_eeGeneral.currModel);
+#endif
 }
 
 void eeCheck(bool immediately)
diff --git a/src/open9x.cpp b/src/open9x.cpp
index 34a21fe82..6855fec8e 100644
--- a/src/open9x.cpp
+++ b/src/open9x.cpp
@@ -3536,6 +3536,8 @@ inline void open9xInit(OPEN9X_INIT_ARGS)
 #endif
 
 #if defined(CPUARM)
+  if (UNEXPECTED_SHUTDOWN())
+    unexpectedShutdown = 1;
   audioQueue.start();
   setBacklight(g_eeGeneral.backlightBright);
 #endif
@@ -3557,7 +3559,7 @@ inline void open9xInit(OPEN9X_INIT_ARGS)
 
   if (UNEXPECTED_SHUTDOWN()) {
     unexpectedShutdown = 1;
-#if defined(PCBSKY9X)
+#if defined(CPUARM)
     eeLoadModel(g_eeGeneral.currModel);
 #endif
   }
@@ -3570,7 +3572,7 @@ inline void open9xInit(OPEN9X_INIT_ARGS)
     }
 #endif
 
-#if defined(PCBSKY9X)
+#if defined(CPUARM)
     eeLoadModel(g_eeGeneral.currModel);
 #endif