diff --git a/zone/waypoints.cpp b/zone/waypoints.cpp
index 8ed940194..90fc25d1e 100644
--- a/zone/waypoints.cpp
+++ b/zone/waypoints.cpp
@@ -1029,7 +1029,7 @@ void ZoneDatabase::ModifyGrid(Client *client, bool remove, uint32 id, uint8 type
 		return;
 	}
 
-	std::string query = StringFormat("DELETE FROM grid where id=%i", id);
+	std::string query = StringFormat("DELETE FROM grid where id=%i and zoneid=%i", id, zoneid);
 	auto results = QueryDatabase(query);
 
 	query = StringFormat("DELETE FROM grid_entries WHERE zoneid = %i AND gridid = %i", zoneid, id);