diff --git a/packages/controller/src/ControlConnection.ts b/packages/controller/src/ControlConnection.ts
index 6baf2fe4..c9c9f8b0 100644
--- a/packages/controller/src/ControlConnection.ts
+++ b/packages/controller/src/ControlConnection.ts
@@ -713,9 +713,14 @@ export default class ControlConnection extends BaseConnection {
 				return null;
 			}
 
-			// Select the latest matching version
+			// Select the latest matching version for the mod pack's Factorio version
 			const release = releases.releases
-				.filter(info => versionRange.testVersion(info.version))
+				.filter(info => (
+					versionRange.testVersion(info.version)
+					&& lib.normaliseMajorMinorVersion(
+						lib.normaliseSourceVersion(info.info_json.factorio_version)
+					) === factorioVersion
+				))
 				.reduce<ModPortalReleaseType | undefined>((max, cur) => (
 					max && lib.integerSourceVersion(max.version) > lib.integerSourceVersion(cur.version) ? max : cur
 				), undefined);
@@ -797,7 +802,11 @@ export default class ControlConnection extends BaseConnection {
 
 			// Check if a local version fits the requirements
 			let candidate = localInfos
-				.filter(info => (info.name === mod.name && versionRange.testVersion(info.version)))
+				.filter(info => (
+					info.name === mod.name
+					&& info.factorioVersion === factorioVersion
+					&& versionRange.testVersion(info.version)
+				))
 				.reduce<lib.ModInfo | undefined>((max, cur) => (
 					max && max.integerVersion > cur.integerVersion ? max : cur
 				), undefined);
diff --git a/test/messages/mod.test.js b/test/messages/mod.test.js
index 200b7417..09d56512 100644
--- a/test/messages/mod.test.js
+++ b/test/messages/mod.test.js
@@ -384,8 +384,10 @@ describe("messages/mod", function() {
 				}
 			});
 			it("prefers the locally installed version if matching", async function() {
-				controller.modStore.addMod(lib.ModInfo.fromJSON({ name: "foo", version: "1.0.0" }));
 				for (const factorioVersion of factorioVersions) {
+					controller.modStore.addMod(lib.ModInfo.fromJSON({
+						name: "foo", version: "1.0.0", factorio_version: factorioVersion,
+					}));
 					setPortalModRelease("root", "1.0.0", factorioVersion, ["foo"]);
 					setPortalModRelease("foo", "2.0.0", factorioVersion, []);
 
@@ -402,8 +404,10 @@ describe("messages/mod", function() {
 				}
 			});
 			it("prefers the mod portal version when checking for updates", async function() {
-				controller.modStore.addMod(lib.ModInfo.fromJSON({ name: "foo", version: "1.0.0" }));
 				for (const factorioVersion of factorioVersions) {
+					controller.modStore.addMod(lib.ModInfo.fromJSON({
+						name: "foo", version: "1.0.0", factorio_version: factorioVersion,
+					}));
 					setPortalModRelease("root", "1.0.0", factorioVersion, ["foo"]);
 					setPortalModRelease("foo", "2.0.0", factorioVersion, []);
 
@@ -455,6 +459,68 @@ describe("messages/mod", function() {
 					assert.deepEqual(depIds, new Set(["root_1.0.0", "foo_2.0.0", "bar_1.5.0"]));
 				}
 			});
+			it("only selects portal releases matching the factorio version", async function() {
+				setPortalModRelease("root", "1.0.0", "2.0", ["foo"]);
+				ModReleases.set("foo", {
+					name: "foo",
+					releases: [{
+						version: "1.0.0", info_json: { factorio_version: "1.1", dependencies: [] },
+					}, {
+						version: "2.0.0", info_json: { factorio_version: "2.0", dependencies: [] },
+					}, {
+						version: "3.0.0", info_json: { factorio_version: "2.1", dependencies: [] },
+					}],
+				});
+
+				const result = await controlConnection.handleModDependencyResolveRequest(
+					new lib.ModDependencyResolveRequest([new ModDependency("root")], "2.0")
+				);
+
+				assert.deepEqual(result.errors, new Map([
+					["base", "notFound"],
+				]));
+
+				const depIds = new Set(result.dependencies.map(mod => mod.id));
+				assert.deepEqual(depIds, new Set(["root_1.0.0", "foo_2.0.0"]));
+			});
+			it("only selects local mods matching the factorio version", async function() {
+				controller.modStore.addMod(lib.ModInfo.fromJSON({
+					name: "foo", version: "1.0.0", factorio_version: "2.0",
+				}));
+				controller.modStore.addMod(lib.ModInfo.fromJSON({
+					name: "foo", version: "3.0.0", factorio_version: "2.1",
+				}));
+				setPortalModRelease("root", "1.0.0", "2.0", ["foo"]);
+				setPortalModRelease("foo", "2.0.0", "2.0", []);
+
+				let result = await controlConnection.handleModDependencyResolveRequest(
+					new lib.ModDependencyResolveRequest([new ModDependency("root")], "2.0")
+				);
+				let depIds = new Set(result.dependencies.map(mod => mod.id));
+				assert.deepEqual(depIds, new Set(["root_1.0.0", "foo_1.0.0"]));
+
+				result = await controlConnection.handleModDependencyResolveRequest(
+					new lib.ModDependencyResolveRequest([new ModDependency("root")], "2.0", true)
+				);
+				depIds = new Set(result.dependencies.map(mod => mod.id));
+				assert.deepEqual(depIds, new Set(["root_1.0.0", "foo_2.0.0"]));
+			});
+			it("highlights dependencies with no release for the factorio version", async function() {
+				setPortalModRelease("root", "1.0.0", "2.0", ["foo"]);
+				setPortalModRelease("foo", "1.0.0", "2.1", []);
+
+				const result = await controlConnection.handleModDependencyResolveRequest(
+					new lib.ModDependencyResolveRequest([new ModDependency("root")], "2.0")
+				);
+
+				assert.deepEqual(result.errors, new Map([
+					["base", "notFound"],
+					["foo", "notFound"],
+				]));
+
+				assert.equal(result.dependencies.length, 1);
+				assert.equal(result.dependencies[0].id, "root_1.0.0");
+			});
 			it("rejects when a network error occurs", async function() {
 				lib.ModStore.fetchModReleases = function() {
 					throw new Error("Mock network error");
@@ -484,7 +550,7 @@ describe("messages/mod", function() {
 					"pyalienlife", "pyalienlifegraphics", "pyalienlifegraphics2", "pyalienlifegraphics3",
 					"pycoalprocessing", "pycoalprocessinggraphics", "pyfusionenergy", "pyfusionenergygraphics",
 					"pypetroleumhandling", "pypetroleumhandlinggraphics", "pyrawores", "pyraworesgraphics",
-					"pyhightech", "pyhightechgraphics", "pyindustry", "pyindustrygraphics", "enable-all-feature-flags",
+					"pyhightech", "pyhightechgraphics", "pyindustry", "pyindustrygraphics",
 				]));
 			});
 		});