diff --git a/EOLib/Domain/Login/LoginActions.cs b/EOLib/Domain/Login/LoginActions.cs
index 57ae02db5..b670bb7d9 100644
--- a/EOLib/Domain/Login/LoginActions.cs
+++ b/EOLib/Domain/Login/LoginActions.cs
@@ -111,6 +111,7 @@ public async Task<short> RequestCharacterLogin(ICharacter character)
 
             _playerInfoRepository.IsFirstTimePlayer = data.FirstTimePlayer;
             _currentMapStateRepository.CurrentMapID = data.MapID;
+            _currentMapStateRepository.JailMapID = data.JailMap;
 
             _paperdollRepository.VisibleCharacterPaperdolls[data.SessionID] = new PaperdollData()
                 .WithName(data.Name)
diff --git a/EOLib/Domain/Map/CurrentMapStateRepository.cs b/EOLib/Domain/Map/CurrentMapStateRepository.cs
index 31b113ad9..4eafa7012 100644
--- a/EOLib/Domain/Map/CurrentMapStateRepository.cs
+++ b/EOLib/Domain/Map/CurrentMapStateRepository.cs
@@ -11,6 +11,8 @@ public interface ICurrentMapStateRepository
 
         bool ShowMiniMap { get; set; }
 
+        short JailMapID { get; set; }
+
         Dictionary<int, ICharacter> Characters { get; set; }
 
         HashSet<INPC> NPCs { get; set; }
@@ -36,6 +38,8 @@ public interface ICurrentMapStateProvider
 
         bool ShowMiniMap { get; }
 
+        short JailMapID { get; }
+
         IReadOnlyDictionary<int, ICharacter> Characters { get; }
 
         IReadOnlyCollection<INPC> NPCs { get; }
@@ -62,6 +66,8 @@ public class CurrentMapStateRepository : ICurrentMapStateRepository, ICurrentMap
 
         public bool ShowMiniMap { get; set; }
 
+        public short JailMapID { get; set; }
+
         public Dictionary<int, ICharacter> Characters { get; set; }
 
         public HashSet<INPC> NPCs { get; set; }
@@ -101,6 +107,7 @@ public void ResetState()
         {
             CurrentMapID = 0;
             ShowMiniMap = false;
+            JailMapID = 0;
 
             Characters = new Dictionary<int, ICharacter>();
             NPCs = new HashSet<INPC>();