diff --git a/jackfredlib-gps/src/client/java/red/jackf/jackfredlib/client/impl/gps/CoordinateGrabber.java b/jackfredlib-gps/src/client/java/red/jackf/jackfredlib/client/impl/gps/CoordinateGrabber.java
index 413a557..98d8fe3 100644
--- a/jackfredlib-gps/src/client/java/red/jackf/jackfredlib/client/impl/gps/CoordinateGrabber.java
+++ b/jackfredlib-gps/src/client/java/red/jackf/jackfredlib/client/impl/gps/CoordinateGrabber.java
@@ -48,9 +48,18 @@ public static Optional<Coordinate> get() {
             ));
         // LAN server
         } else if (serverData.isLan()) {
-            String motd = serverData.motd.getString();
+            // LAN-FIX VERSION: motd can be null sometimes, fallback to server name or empty string
+            String motd = serverData.motd != null ? serverData.motd.getString() : 
+                         (serverData.name != null ? serverData.name : "LAN");
+            // Extract world name from MOTD format "PlayerName - WorldName"
+            // Use singleplayer prefix so LAN guests share the same Memory Bank as host
+            String worldName = motd;
+            int separatorIndex = motd.indexOf(" - ");
+            if (separatorIndex != -1 && separatorIndex + 3 < motd.length()) {
+                worldName = motd.substring(separatorIndex + 3);
+            }
             return Optional.of(new Coordinate.Lan(
-                    "lan/" + Sanitizer.sanitize(motd),
+                    "singleplayer/" + Sanitizer.sanitize(worldName),
                     "LAN: " + motd
             ));
         // Multiplayer