diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/gaudio_play_board.h b/boards/base/Mikromedia-STM32-M4-ILI9341/gaudio_play_board.h
index 9b16b27a..72e557e4 100644
--- a/boards/base/Mikromedia-STM32-M4-ILI9341/gaudio_play_board.h
+++ b/boards/base/Mikromedia-STM32-M4-ILI9341/gaudio_play_board.h
@@ -60,10 +60,10 @@ static inline void board_startcmdwrite(void) {
 
 // End a command write
 static inline void board_endcmdwrite(void) {
+	SET_CS;
 	#if SPI_USE_MUTUAL_EXCLUSION
 		spiReleaseBus(SPI_PORT);
 	#endif
-	SET_CS;
 }
 
 // Start a command read
diff --git a/drivers/gaudio/vs1053/gaudio_play_lld.c b/drivers/gaudio/vs1053/gaudio_play_lld.c
index 9e77e383..fc62fea2 100644
--- a/drivers/gaudio/vs1053/gaudio_play_lld.c
+++ b/drivers/gaudio/vs1053/gaudio_play_lld.c
@@ -188,7 +188,7 @@ static void FeedData(void *param) {
 	(void)		param;
 
 	// While there is data space
-	while (!board_dreq()) {
+	while (board_dreq()) {
 
 		// Send up to 32 bytes
 		len = playlen;