diff --git a/Addons/Guis/warp-system.lua b/Addons/Guis/warp-system.lua
index b6f5c93f..ddad3638 100644
--- a/Addons/Guis/warp-system.lua
+++ b/Addons/Guis/warp-system.lua
@@ -154,7 +154,7 @@ Gui.left.add{
         }
         for name,warp in pairs(_warps().warps) do
             if not warp.tag or not warp.tag.valid then
-                player.force.add_chart_tag(warp.surface,{
+                warp.tag = player.force.add_chart_tag(warp.surface,{
                     position=warp.position,
                     text='Warp: '..name,
                     icon={type='item',name=warp_item}
@@ -234,4 +234,4 @@ Event.register(defines.events.on_player_created, function(event)
         })
         _warps().warps['Spawn'] = {tag=tag,surface=player.surface,position={0,0}}
     end
-end)
\ No newline at end of file
+end)