diff --git a/radio/src/audio_arm.h b/radio/src/audio_arm.h
index 52a9cbb2b..00251a3f9 100644
--- a/radio/src/audio_arm.h
+++ b/radio/src/audio_arm.h
@@ -199,10 +199,7 @@ class AudioQueue {
         AudioBuffer * buffer = &buffers[idx];
         if (buffer->state == AUDIO_BUFFER_FILLED) {
           buffer->state = AUDIO_BUFFER_PLAYING;
-          if (idx != bufferRIdx) {
-            TRACEI_AUDIO_EVENT(1, audio_getNextFilledBuffer_skip, ((uint32_t)bufferRIdx << 8) +  idx);
-            bufferRIdx = idx;
-          }
+          bufferRIdx = idx;
           return buffer;
         }
         idx = nextBufferIdx(idx);
diff --git a/radio/src/targets/sky9x/diskio.cpp b/radio/src/targets/sky9x/diskio.cpp
index 388182ad0..1452201e9 100644
--- a/radio/src/targets/sky9x/diskio.cpp
+++ b/radio/src/targets/sky9x/diskio.cpp
@@ -1304,15 +1304,14 @@ DRESULT disk_read (
     }
   } while ( count ) ;
 
-  if (!count) {
-    IO_MUTEX_LEAVE();
+  IO_MUTEX_LEAVE();
+  
+  if (!count)
     return RES_OK;
-  }
 
   if (++sdErrorCount > 3)
     Card_state = SD_ST_ERR;
 
-  IO_MUTEX_LEAVE();
   return RES_ERROR;
 }