diff --git a/builder/main.py b/builder/main.py
index 9eaa377..dc12116 100644
--- a/builder/main.py
+++ b/builder/main.py
@@ -49,11 +49,12 @@ def _get_board_f_flash(env):
 
 
 def _get_board_flash_mode(env):
+    memory_type = env.BoardConfig().get("build.arduino.memory_type", "qio_qspi")
     mode = env.subst("$BOARD_FLASH_MODE")
-    if mode == "qio":
-        return "dio"
-    elif mode == "qout":
+    if memory_type in ("opi_opi", "opi_qspi"):
         return "dout"
+    if mode in ("qio", "qout"):
+        return "dio"
     return mode