diff --git a/src/map/Map.js b/src/map/Map.js
index 6cd82fd9..4861695d 100644
--- a/src/map/Map.js
+++ b/src/map/Map.js
@@ -722,6 +722,10 @@ export var Map = Evented.extend({
 			this._containerId = undefined;
 		}
 
+		if (this._locationWatchId !== undefined) {
+			this.stopLocate();
+		}
+
 		this._stop();
 
 		DomUtil.remove(this._mapPane);