diff --git a/.changeset/shaggy-keys-jam.md b/.changeset/shaggy-keys-jam.md
new file mode 100644
index 00000000..cf8e7e83
--- /dev/null
+++ b/.changeset/shaggy-keys-jam.md
@@ -0,0 +1,5 @@
+---
+"forbidden-lands": patch
+---
+
+Fix skills not rendering correctly on character sheet when attributes have been swapped
diff --git a/src/actor/actor-sheet.js b/src/actor/actor-sheet.js
index b924642a..9c9a1dda 100644
--- a/src/actor/actor-sheet.js
+++ b/src/actor/actor-sheet.js
@@ -529,10 +529,10 @@ export class ForbiddenLandsActorSheet extends ActorSheet {
 	}
 
 	computeSkills(data) {
-		for (const skill of Object.values(data.system.skill)) {
-			skill[`has${skill?.attribute?.capitalize()}`] = false;
-			if (CONFIG.fbl.attributes.includes(skill.attribute))
-				skill[`has${skill.attribute.capitalize()}`] = true;
+		const map = CONFIG.fbl.skillAttributeMap;
+		for (const [key, skill] of Object.entries(data.system.skill)) {
+			const connectedAttribute = map[key];
+			skill[`has${connectedAttribute.capitalize()}`] = true;
 		}
 		return data;
 	}