diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp
index 6780b042c..4169428fe 100644
--- a/src/server/scripts/Commands/cs_go.cpp
+++ b/src/server/scripts/Commands/cs_go.cpp
@@ -352,7 +352,7 @@ public:
         float x = locationValues[0];
         float y = locationValues[1];
 
-        if (!sMapStore.LookupEntry(mapId))
+        if (!sMapStore.LookupEntry(mapId) || !MapMgr::IsValidMapCoord(mapId, x, y))
         {
             handler->SendErrorMessage(LANG_INVALID_TARGET_COORD, x, y, mapId);
             return false;