diff --git a/src/game/WaypointManager.cpp b/src/game/WaypointManager.cpp
index 9bdd8c9373..0cbdd0bf97 100644
--- a/src/game/WaypointManager.cpp
+++ b/src/game/WaypointManager.cpp
@@ -30,6 +30,7 @@ void WaypointStore::Free()
     {
         for (WaypointPath::const_iterator it = itr->second->begin(); it != itr->second->end(); ++it)
             delete *it;
+        itr->second->clear();
         delete itr->second;
     }
     waypoint_map.clear();