diff --git a/server/plugin/control/control.go b/server/plugin/control/control.go
index 3149380..5b4872b 100644
--- a/server/plugin/control/control.go
+++ b/server/plugin/control/control.go
@@ -107,11 +107,17 @@ func (m *Match) MatchJoin(ctx context.Context, logger runtime.Logger, db *sql.DB
 		player, loadPlayerErr := entities.LoadPlayer(ctx, nk, precense)
 		if loadPlayerErr != nil {
 			logger.Error(loadPlayerErr.Error())
+			player.X = 16
+			player.Y = 16
+		} else {
+			player = entities.PlayerEntity{
+				X:        16,
+				Y:        16,
+				Name:     "ERROR",
+				Presence: precense,
+			}
 		}
 
-		player.X = 16
-		player.Y = 16
-
 		if jsonObj, err := player.GetPosJSON(); err != nil {
 			logger.Error(err.Error())
 		} else {
diff --git a/server/plugin/entities/entities.go b/server/plugin/entities/entities.go
index 51d3158..fdfdefd 100644
--- a/server/plugin/entities/entities.go
+++ b/server/plugin/entities/entities.go
@@ -80,6 +80,8 @@ func LoadPlayer(ctx context.Context, nk runtime.NakamaModule, presence runtime.P
 			}
 			player.Name = responseData.Name
 			player.Faction = gameworld.Faction(responseData.Faction)
+			player.X = 16.0
+			player.Y = 16.0
 		}
 	}
 	return player, nil