diff --git a/firmware/system.c b/firmware/system.c
index 234e29433d..16bea107d6 100644
--- a/firmware/system.c
+++ b/firmware/system.c
@@ -493,8 +493,8 @@ void system_init(void)
 
     /* Bus state controller initializations. These are only necessary when
        running from flash. The correct settings for player models are not
-       verified, so we only do this for the recorder. */
-#ifdef HAVE_RECORDING
+       verified, so we only do this for the recorder and for the Ondio. */
+#if defined(HAVE_RECORDING) || defined(HAVE_MMC)
     WCR1 = 0x4000; /* Long wait states for CS6 (ATA), short for the rest. */
     WCR3 = 0x8000; /* WAIT is pulled up, 1 state inserted for CS6 */
 #endif