diff --git a/js/control/TrackAnalysis.js b/js/control/TrackAnalysis.js
index e6564e9..cd3c1c2 100644
--- a/js/control/TrackAnalysis.js
+++ b/js/control/TrackAnalysis.js
@@ -91,6 +91,14 @@ BR.TrackAnalysis = L.Class.extend({
 
         if (segments.length === 0) {
             $('#track_statistics').html('');
+            if (this.highlightedSegments) {
+                this.map.removeLayer(this.highlightedSegments);
+                this.highlightedSegments = null;
+            }
+            if (this.highlightedSegment) {
+                this.map.removeLayer(this.highlightedSegment);
+                this.highlightedSegment = null;
+            }
             return;
         }
 
diff --git a/js/control/TrackMessages.js b/js/control/TrackMessages.js
index 6dfa140..3116e1a 100644
--- a/js/control/TrackMessages.js
+++ b/js/control/TrackMessages.js
@@ -77,6 +77,7 @@ BR.TrackMessages = L.Class.extend({
         }
 
         this._destroyTable();
+        this._destroyEdges();
 
         if (data.length === 0) {
             this.listenMapEvents(layer, false);
@@ -146,6 +147,17 @@ BR.TrackMessages = L.Class.extend({
         return ele || document.getElementById('datatable');
     },
 
+    _destroyEdges: function () {
+        if (this._selectedEdge) {
+            this._map.removeLayer(this._selectedEdge);
+            this._selectedEdge = null;
+        }
+        if (this._hoveredEdge) {
+            this._map.removeLayer(this._hoveredEdge);
+            this._hoveredEdge = null;
+        }
+    },
+
     _getColumns: function (headings, data) {
         var columns = [],
             defaultOptions,