diff --git a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/MapRequest.java b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/MapRequest.java
index 3f644dc1d..2d937f3fd 100644
--- a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/MapRequest.java
+++ b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/MapRequest.java
@@ -101,7 +101,7 @@ public MapRequest(WurstLanguageServer langServer, Optional<File> map, List<Strin
         this.runArgs = new RunArgs(compileArgs);
         this.wc3Path = wc3Path;
         if (gameExePath.isPresent() && StringUtils.isNotBlank(gameExePath.get())) {
-            this.w3data = new W3InstallationData(Optional.of(new File(gameExePath.get())), Optional.of(GameVersion.VERSION_1_29));
+            this.w3data = new W3InstallationData(Optional.of(new File(gameExePath.get())), Optional.empty());
         } else {
             this.w3data = getBestW3InstallationData();
         }
diff --git a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/utils/W3InstallationData.java b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/utils/W3InstallationData.java
index 158419467..829373155 100644
--- a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/utils/W3InstallationData.java
+++ b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/utils/W3InstallationData.java
@@ -34,6 +34,14 @@ public W3InstallationData(Optional<File> gameExe, Optional<GameVersion> version)
         this.languageServer = null;
         this.gameExe = gameExe;
         this.version = version;
+        if (!this.version.isPresent() && this.gameExe.isPresent()) {
+            try {
+                this.version = Optional.ofNullable(GameExe.getVersion(this.gameExe.get()));
+                WLogger.info("Parsed game version from configured executable: " + this.version);
+            } catch (IOException e) {
+                WLogger.warning("Could not parse game version from configured executable", e);
+            }
+        }
     }
 
     /** Evaluates the game path and version by discovering the system environment. */