diff --git a/configs/spark/composite/defconfig b/configs/spark/composite/defconfig
index 6f4fdbec014..913cecb4efb 100644
--- a/configs/spark/composite/defconfig
+++ b/configs/spark/composite/defconfig
@@ -601,6 +601,8 @@ CONFIG_USBMSC_PRODUCTID=0x5342
 CONFIG_USBMSC_PRODUCTSTR="Mass Storage"
 CONFIG_USBMSC_VERSIONNO=0x399
 # CONFIG_USBMSC_REMOVABLE is not set
+CONFIG_USBMSC_SCSI_PRIO=128
+CONFIG_USBMSC_SCSI_STACKSIZE=340
 # CONFIG_USBHOST is not set
 CONFIG_WIRELESS=y
 # CONFIG_WL_CC1101 is not set
diff --git a/configs/spark/nsh/defconfig b/configs/spark/nsh/defconfig
index 154a96d2768..8c296bb9640 100644
--- a/configs/spark/nsh/defconfig
+++ b/configs/spark/nsh/defconfig
@@ -601,6 +601,8 @@ CONFIG_USBMSC_PRODUCTID=0x5342
 CONFIG_USBMSC_PRODUCTSTR="Mass Storage"
 CONFIG_USBMSC_VERSIONNO=0x399
 # CONFIG_USBMSC_REMOVABLE is not set
+CONFIG_USBMSC_SCSI_PRIO=128
+CONFIG_USBMSC_SCSI_STACKSIZE=464
 # CONFIG_USBHOST is not set
 CONFIG_WIRELESS=y
 # CONFIG_WL_CC1101 is not set
diff --git a/configs/spark/usbmsc/defconfig b/configs/spark/usbmsc/defconfig
index cfb76295ce1..adc9d0db4b9 100644
--- a/configs/spark/usbmsc/defconfig
+++ b/configs/spark/usbmsc/defconfig
@@ -565,6 +565,8 @@ CONFIG_USBMSC_PRODUCTID=0x5342
 CONFIG_USBMSC_PRODUCTSTR="Mass Storage"
 CONFIG_USBMSC_VERSIONNO=0x399
 # CONFIG_USBMSC_REMOVABLE is not set
+CONFIG_USBMSC_SCSI_PRIO=128
+CONFIG_USBMSC_SCSI_STACKSIZE=340
 # CONFIG_USBHOST is not set
 CONFIG_WIRELESS=y
 # CONFIG_WL_CC1101 is not set
@@ -993,8 +995,6 @@ CONFIG_SYSTEM_USBMSC_DEVPATH3="/dev/mmcsd2"
 # CONFIG_SYSTEM_USBMSC_DEBUGMM is not set
 CONFIG_SYSTEM_USBMSC_CMD_STACKSIZE=768
 CONFIG_SYSTEM_USBMSC_CMD_PRIORITY=100
-CONFIG_SYSTEM_USBMSC_DAEMON_STACKSIZE=2048
-CONFIG_SYSTEM_USBMSC_DAEMON_PRIORITY=100
 
 #
 # Zmodem Commands
diff --git a/configs/teensy/usbmsc/defconfig b/configs/teensy/usbmsc/defconfig
index 00f1a6305d4..be26e21ea9d 100644
--- a/configs/teensy/usbmsc/defconfig
+++ b/configs/teensy/usbmsc/defconfig
@@ -328,6 +328,8 @@ CONFIG_USBMSC_PRODUCTID=0x5342
 CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
 CONFIG_USBMSC_VERSIONNO=0x0399
 CONFIG_USBMSC_REMOVABLE=y
+CONFIG_USBMSC_SCSI_PRIO=128
+CONFIG_USBMSC_SCSI_STACKSIZE=512
 # CONFIG_USBHOST is not set
 # CONFIG_WIRELESS is not set