diff --git a/pio-tools/pre_source_dir.py b/pio-tools/pre_source_dir.py
index 8ff1e8753..74d327f81 100644
--- a/pio-tools/pre_source_dir.py
+++ b/pio-tools/pre_source_dir.py
@@ -12,6 +12,11 @@ def FindInoNodes(env):
 env.AddMethod(FindInoNodes)
 
 # Pass flashmode at build time to macro
-tasmota_flash_mode = "-DCONFIG_TASMOTA_FLASHMODE_" + (env.BoardConfig().get("build.flash_mode", "dio")).upper()
+memory_type = env.BoardConfig().get("build.arduino.memory_type", "").upper()
+flash_mode = env.BoardConfig().get("build.flash_mode", "dio").upper()
+if "OPI_" in memory_type:
+    flash_mode = "OPI"
+
+tasmota_flash_mode = "-DCONFIG_TASMOTA_FLASHMODE_" + flash_mode
 env.Append(CXXFLAGS=[tasmota_flash_mode])
 print(tasmota_flash_mode)
diff --git a/tasmota/include/tasmota_globals.h b/tasmota/include/tasmota_globals.h
index 3da0af66d..3fe15e195 100644
--- a/tasmota/include/tasmota_globals.h
+++ b/tasmota/include/tasmota_globals.h
@@ -74,7 +74,9 @@ String EthernetMacAddress(void);
 \*-------------------------------------------------------------------------------------------*/
 
 // created in pio-tools/pre_source_dir.py
-#if defined(CONFIG_TASMOTA_FLASHMODE_QIO)
+#if defined(CONFIG_TASMOTA_FLASHMODE_OPI)
+  #define D_TASMOTA_FLASHMODE "OPI"
+#elif (CONFIG_TASMOTA_FLASHMODE_QIO)
   #define D_TASMOTA_FLASHMODE "QIO"
 #elif defined(CONFIG_TASMOTA_FLASHMODE_QOUT)
    #define D_TASMOTA_FLASHMODE "QOUT"