diff --git a/pio-tools/post_esp32.py b/pio-tools/post_esp32.py
index 782eed772..f0e670a72 100644
--- a/pio-tools/post_esp32.py
+++ b/pio-tools/post_esp32.py
@@ -36,13 +36,8 @@ FRAMEWORK_DIR = platform.get_package_dir("framework-arduinoespressif32")
 variants_dir = join(FRAMEWORK_DIR, "variants", "tasmota")
 
 def esp32_fetch_safemode_bin(chip):
-    if "solo1" in env.subst("$BUILD_DIR"):
-        safemode_fw_url = "https://github.com/arendst/Tasmota-firmware/raw/main/firmware/tasmota32/tasmota32solo1-safemode.bin"
-        safemode_fw_name = join(variants_dir,"tasmota32solo1-safemode.bin")
-    else:
-        safemode_fw_url = "https://github.com/arendst/Tasmota-firmware/raw/main/firmware/tasmota32/tasmota" + chip[3:] + "-safemode.bin"
-        safemode_fw_name = join(variants_dir,"tasmota" + chip[3:] + "-safemode.bin")
-
+    safemode_fw_url = "https://github.com/arendst/Tasmota-firmware/raw/main/firmware/tasmota32/tasmota" + chip[3:] + "-safemode.bin"
+    safemode_fw_name = join(variants_dir,"tasmota" +  ("32solo1" if "solo1" in env.subst("$BUILD_DIR") else chip[3:]) + "-safemode.bin")
     if(exists(safemode_fw_name)):
         print("Safemode binary already in place.")
         return
@@ -54,7 +49,7 @@ def esp32_fetch_safemode_bin(chip):
 
 def esp32_copy_new_safemode_bin(chip,new_local_safemode_fw):
     print("Copy new local safemode firmware to variants dir -> using it for further flashing operations")
-    safemode_fw_name = join(variants_dir,"tasmota" + chip[3:] + "-safemode.bin")
+    safemode_fw_name = join(variants_dir,"tasmota" + ("32solo1" if "solo1" in env.subst("$BUILD_DIR") else chip[3:]) + "-safemode.bin")
     if os.path.exists(variants_dir):
         shutil.copy(new_local_safemode_fw, safemode_fw_name)