diff --git a/doc/mapflags.txt b/doc/mapflags.txt
index d2c65bd94b9..981c2256931 100644
--- a/doc/mapflags.txt
+++ b/doc/mapflags.txt
@@ -222,8 +222,7 @@ Disables mine effects on a map.
 
 *nolockon
 
-Disables locking on a map.
-[More information needed.]
+Disables attacking another player without holding shift or using /ns on a map.
 
 ---------------------------------------
 
diff --git a/npc/re/mapflag/nolockon.txt b/npc/re/mapflag/nolockon.txt
new file mode 100644
index 00000000000..598a8afb7a1
--- /dev/null
+++ b/npc/re/mapflag/nolockon.txt
@@ -0,0 +1,8 @@
+//===== rAthena Script =======================================
+//= Mapflag: Nolockon
+//===== Description: ========================================= 
+//= Disables attacks on another player on clientside
+//= without using shift or /ns
+//===== Changelogs: ==========================================
+//= 0.1 Created empty file for further usage [Lemongrass]
+//============================================================
diff --git a/npc/re/scripts_mapflags.conf b/npc/re/scripts_mapflags.conf
index aeefc17eae4..e8e3c272afa 100644
--- a/npc/re/scripts_mapflags.conf
+++ b/npc/re/scripts_mapflags.conf
@@ -6,6 +6,7 @@ npc: npc/re/mapflag/gvg.txt
 npc: npc/re/mapflag/hidemobhpbar.txt
 npc: npc/re/mapflag/nobranch.txt
 npc: npc/re/mapflag/noicewall.txt
+npc: npc/re/mapflag/nolockon.txt
 npc: npc/re/mapflag/nomemo.txt
 npc: npc/re/mapflag/nopenalty.txt
 npc: npc/re/mapflag/nosave.txt
diff --git a/src/map/clif.c b/src/map/clif.c
index 84c0836936d..8e656659318 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -6235,7 +6235,7 @@ void clif_map_property(struct block_list *bl, enum map_property property, enum s
 		((map[bl->m].flag.battleground || map_flag_gvg(bl->m)?1:0)<<1)|// GUILD - Show attack cursor on non-guild members (GvG)
 		((map[bl->m].flag.battleground || map_flag_gvg2(bl->m)?1:0)<<2)|// SIEGE - Show emblem over characters heads when in GvG (WoE castle)
 		((map[bl->m].flag.nomineeffect || !map_flag_gvg2(bl->m)?0:1)<<3)| // USE_SIMPLE_EFFECT - Automatically enable /mineffect
-		((map[bl->m].flag.nolockon?1:0)<<4)| // DISABLE_LOCKON - Unknown (By the name it might disable cursor lock-on)
+		((map[bl->m].flag.nolockon?0:1)<<4)| // DISABLE_LOCKON - Only allow attacks on other players with shift key or /ns active
 		((map[bl->m].flag.pvp?1:0)<<5)| // COUNT_PK - Show the PvP counter
 		((map[bl->m].flag.partylock?1:0)<<6)| // NO_PARTY_FORMATION - Prevents party creation/modification (Might be used for instance dungeons)
 		((map[bl->m].flag.battleground?1:0)<<7)| // BATTLEFIELD - Unknown (Does something for battlegrounds areas)