diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp
index fdff62fe31..420b5190ec 100644
--- a/src/map/atcommand.cpp
+++ b/src/map/atcommand.cpp
@@ -1786,8 +1786,7 @@ ACMD_FUNC(pvpoff)
 		return -1;
 	}
 
-	map_setmapflag(sd->bl.m, MF_PVP, false); // Needed to remove battle and client settings.
-	map_zone_db.setZone(sd->bl.m, map_zone_db.getMapZone(sd->bl.m));
+	map_setmapflag(sd->bl.m, MF_PVP, false);
 
 	clif_displaymessage(fd, msg_txt(sd,31)); // PvP: Off.
 	return 0;
@@ -1805,7 +1804,7 @@ ACMD_FUNC(pvpon)
 		return -1;
 	}
 
-	map_zone_db.setZone(sd->bl.m, MAPTYPE_NOPENALTY_FREEPKZONE);
+	map_setmapflag(sd->bl.m, MF_PVP, true);
 
 	clif_displaymessage(fd, msg_txt(sd,32)); // PvP: On.
 
@@ -1824,8 +1823,7 @@ ACMD_FUNC(gvgoff)
 		return -1;
 	}
 
-	map_setmapflag(sd->bl.m, MF_GVG, false); // Needed to remove battle and client settings.
-	map_zone_db.setZone(sd->bl.m, map_zone_db.getMapZone(sd->bl.m));
+	map_setmapflag(sd->bl.m, MF_GVG, false);
 
 	clif_displaymessage(fd, msg_txt(sd,33)); // GvG: Off.
 
@@ -1844,7 +1842,7 @@ ACMD_FUNC(gvgon)
 		return -1;
 	}
 
-	map_zone_db.setZone(sd->bl.m, MAPTYPE_EVENT_GUILDWAR);
+	map_setmapflag(sd->bl.m, MF_GVG, true);
 
 	clif_displaymessage(fd, msg_txt(sd,34)); // GvG: On.