diff --git a/source/Launcher/Enderal Launcher.au3 b/source/Launcher/Enderal Launcher.au3
index ed78e3888..fa98c7cfa 100644
--- a/source/Launcher/Enderal Launcher.au3	
+++ b/source/Launcher/Enderal Launcher.au3	
@@ -117,6 +117,9 @@ Global $bPluginListReadOnly = False
 ; Steam version detection
 Global $bIsSteamVersion = False
 
+; Steam install waiting for the not savegame compatible 2.1+ update
+Global $bPendingBranchUpdate = False
+
 ; Mod Organizer 2 directory, empty when the launcher was not started by MO2
 Global $MO2_DIR = ""
 
@@ -730,10 +733,17 @@ Func StartupChecks()
     $MO2_DIR = GetMO2Directory()
     $bPluginListReadOnly = ($MO2_DIR <> "")
 
+    ; Steam will push 2.1+ over this install, which is not savegame compatible with 2.0
+    $bPendingBranchUpdate = ($bIsSteamVersion And GetEnderalVersion() = "2.0.12.4")
+
     CheckRegistryPaths()
     CheckPluginsFile()
     CheckINIFiles()
     CheckSaveDirectory()
+
+    If $bPendingBranchUpdate Then
+        MsgBox(48, "Enderal Special Edition", "Enderal Special Edition is scheduled for update to version 2.1+ which requires starting a new game. If you have an ongoing savegame, please switch to the 2.0.12.4 branch.")
+    EndIf
 EndFunc
 
 Func CheckRegistryPaths()
@@ -910,6 +920,9 @@ Func CheckINIFiles()
 EndFunc
 
 Func CheckSaveDirectory()
+    ; Leave the save path alone while 2.1+ is pending, so existing 2.0 savegames stay where the game expects them
+    If $bPendingBranchUpdate Then Return
+
     ; Read sLocalSavePath from Enderal.ini (or custom INI) and ensure the directory exists
     Local $savePath = IniReadWithCustom("General", "sLocalSavePath", "")