diff --git a/LightlessSync/Services/DalamudUtilService.cs b/LightlessSync/Services/DalamudUtilService.cs
index 96c78f3..03ed35d 100644
--- a/LightlessSync/Services/DalamudUtilService.cs
+++ b/LightlessSync/Services/DalamudUtilService.cs
@@ -60,6 +60,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
     private string _lastGlobalBlockReason = string.Empty;
     private ushort _lastZone = 0;
     private ushort _lastWorldId = 0;
+    private uint _lastMapId = 0;
     private bool _sentBetweenAreas = false;
     private Lazy<ulong> _cid;
 
@@ -689,7 +690,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
                 var outside = houseMan->OutdoorTerritory;
                 var house = outside->HouseId;
                 location.WardId = house.WardIndex + 1u;
-                location.HouseId = (uint)houseMan->GetCurrentPlot() + 1;
+                //location.HouseId = (uint)houseMan->GetCurrentPlot() + 1;
                 location.DivisionId = houseMan->GetCurrentDivision();
             }
             //_logger.LogWarning(LocationToString(location));
@@ -1139,6 +1140,18 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
                 Mediator.Publish(new ZoneSwitchEndMessage());
                 Mediator.Publish(new ResumeScanMessage(nameof(ConditionFlag.BetweenAreas)));
             }
+            
+            //Map
+            if (!_sentBetweenAreas)
+            {
+                var mapid = _clientState.MapId;
+                if (mapid != _lastMapId)
+                {
+                    _lastMapId = mapid;
+                    Mediator.Publish(new MapChangedMessage(mapid));
+                }
+            }
+            
 
             var localPlayer = _objectTable.LocalPlayer;
             if (localPlayer != null)
diff --git a/LightlessSync/Services/LocationShareService.cs b/LightlessSync/Services/LocationShareService.cs
index 77b5c90..38b2834 100644
--- a/LightlessSync/Services/LocationShareService.cs
+++ b/LightlessSync/Services/LocationShareService.cs
@@ -17,8 +17,6 @@ namespace LightlessSync.Services
         private IMemoryCache _sharingStatus = new MemoryCache(new MemoryCacheOptions());
         private CancellationTokenSource _resetToken = new CancellationTokenSource();
         
-        
-        
         public LocationShareService(ILogger<LocationShareService> logger, LightlessMediator mediator, DalamudUtilService dalamudUtilService, ApiController apiController) : base(logger, mediator)
         {
             _dalamudUtilService = dalamudUtilService;
@@ -37,7 +35,7 @@ namespace LightlessSync.Services
                 _ = RequestAllLocation();
             } );
             Mediator.Subscribe<LocationSharingMessage>(this, UpdateLocationList);
-            Mediator.Subscribe<ZoneSwitchEndMessage>(this,
+            Mediator.Subscribe<MapChangedMessage>(this,
                 msg => _ = _apiController.UpdateLocation(new LocationDto(new UserData(_apiController.UID, _apiController.DisplayName), _dalamudUtilService.GetMapData())));
         }
 
@@ -134,5 +132,6 @@ namespace LightlessSync.Services
                 AddStatus(user, expireAt);
             }
         }
+        
     }
 }
\ No newline at end of file
diff --git a/LightlessSync/Services/Mediator/Messages.cs b/LightlessSync/Services/Mediator/Messages.cs
index 00f8de7..efe3341 100644
--- a/LightlessSync/Services/Mediator/Messages.cs
+++ b/LightlessSync/Services/Mediator/Messages.cs
@@ -136,5 +136,6 @@ public record ChatChannelMessageAdded(string ChannelKey, ChatMessageEntry Messag
 public record GroupCollectionChangedMessage : MessageBase;
 public record OpenUserProfileMessage(UserData User) : MessageBase;
 public record LocationSharingMessage(UserData User, LocationInfo LocationInfo, DateTimeOffset ExpireAt) : MessageBase;
+public record MapChangedMessage(uint MapId) : MessageBase;
 #pragma warning restore S2094
 #pragma warning restore MA0048 // File name must match type name
\ No newline at end of file