diff --git a/demos/host/src/msc_app.c b/demos/host/src/msc_app.c
index 2c5096e11..520bfa5b1 100644
--- a/demos/host/src/msc_app.c
+++ b/demos/host/src/msc_app.c
@@ -58,7 +58,7 @@
 //--------------------------------------------------------------------+
 // INTERNAL OBJECT & FUNCTION DECLARATION
 //--------------------------------------------------------------------+
-OSAL_TASK_DEF(msc_app_task, 300, MSC_APP_TASK_PRIO);
+OSAL_TASK_DEF(msc_app_task, 512, MSC_APP_TASK_PRIO);
 
 static FATFS fatfs[TUSB_CFG_HOST_DEVICE_MAX] TUSB_CFG_ATTR_USBRAM;
 
diff --git a/vendor/fatfs/diskio.c b/vendor/fatfs/diskio.c
index e6b777fef..8d6794d47 100644
--- a/vendor/fatfs/diskio.c
+++ b/vendor/fatfs/diskio.c
@@ -42,8 +42,8 @@
 //--------------------------------------------------------------------+
 // INCLUDE
 //--------------------------------------------------------------------+
+#include "ffconf.h"
 #include "diskio.h"
-
 //--------------------------------------------------------------------+
 // MACRO CONSTANT TYPEDEF
 //--------------------------------------------------------------------+
@@ -63,6 +63,9 @@ static DRESULT wait_for_io_complete(uint8_t usb_addr)
   while ( tusbh_msc_is_busy(usb_addr) )
   {
     // TODO should have timeout here
+    #if TUSB_CFG_OS != TUSB_OS_NONE
+    osal_task_delay(10);
+    #endif
   }
 
   return RES_OK;