diff --git a/CHANGELOG.md b/CHANGELOG.md
index 716992a..f9f175b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release Notes
 
+### Version 2.15.4
+- fixed game state JSON not handling custom Fabled correctly
+- fixed Nightwatchman
+
 ### Version 2.15.3
 - add Huntsman/Damsel, Noble, Al-Hadikhia, Golem, Fearmonger, Puzzlemaster, Alchemist, Engineer, Riot, Psychopath, Atheist, Nightwatchman to list of available characters
 
diff --git a/src/components/modals/GameStateModal.vue b/src/components/modals/GameStateModal.vue
index b7a7771..feac038 100644
--- a/src/components/modals/GameStateModal.vue
+++ b/src/components/modals/GameStateModal.vue
@@ -40,7 +40,9 @@ export default {
         roles: this.edition.isOfficial
           ? ""
           : this.$store.getters.customRolesStripped,
-        fabled: this.players.fabled.map(({ id }) => id),
+        fabled: this.players.fabled.map(fabled =>
+          fabled.isCustom ? fabled : { id: fabled.id }
+        ),
         players: this.players.players.map(player => ({
           ...player,
           role: player.role.id || {}
@@ -79,7 +81,12 @@ export default {
         }
         if (fabled) {
           this.$store.commit("players/setFabled", {
-            fabled: fabled.map(id => this.$store.state.fabled.get(id))
+            fabled: fabled.map(
+              f =>
+                this.$store.state.fabled.get(f) ||
+                this.$store.state.fabled.get(f.id) ||
+                f
+            )
           });
         }
         if (players) {