diff --git a/src/components/map/TrackLayer.vue b/src/components/map/TrackLayer.vue
index f4637ddf9..d396d0954 100644
--- a/src/components/map/TrackLayer.vue
+++ b/src/components/map/TrackLayer.vue
@@ -79,7 +79,7 @@ export default {
 		end: {
 			type: Number,
 			required: false,
-			default: moment.unix(),
+			default: moment().unix(),
 		},
 	},
 
@@ -113,7 +113,7 @@ export default {
 		},
 		lines() {
 			const trkSegments = []
-			if (this.track.metadata?.begin >= this.end || this.track.metadata?.end <= this.start) {
+			if (this.track.metadata?.begin >= this.end || (this.track.metadata?.end >= 0 && this.track.metadata?.end <= this.start)) {
 				return trkSegments
 			} else if (this.track.metadata?.begin >= this.start && this.track.metadata?.end <= this.end) {
 				this.track.data.tracks.forEach((trk) => {
@@ -129,8 +129,8 @@ export default {
 				this.track.data.tracks.forEach((trk) => {
 					trk.segments.forEach((segment) => {
 						const lastNullIndex = binSearch(segment.points, (p) => !p.timestamp)
-						const firstShownIndex = binSearch(segment.points, (p) => (p.timestamp || 0) < this.start) + 1
-						const lastShownIndex = binSearch(segment.points, (p) => (p.timestamp || 0) < this.end)
+						const firstShownIndex = binSearch(segment.points, (p) => (p.timestamp || -1) < this.start) + 1
+						const lastShownIndex = binSearch(segment.points, (p) => (p.timestamp || -1) < this.end)
 						const points = [
 							...segment.points.slice(0, lastNullIndex + 1),
 							...segment.points.slice(firstShownIndex, lastShownIndex + 1),
diff --git a/src/components/map/TracksLayer.vue b/src/components/map/TracksLayer.vue
index 133390a85..7ae892a62 100644
--- a/src/components/map/TracksLayer.vue
+++ b/src/components/map/TracksLayer.vue
@@ -49,7 +49,7 @@ export default {
 		end: {
 			type: Number,
 			required: false,
-			default: moment.unix(),
+			default: moment().unix(),
 		},
 	},
 
diff --git a/src/views/App.vue b/src/views/App.vue
index 93fa52aee..0335de100 100644
--- a/src/views/App.vue
+++ b/src/views/App.vue
@@ -2,7 +2,7 @@
 	<Content app-name="maps">
 		<MapsNavigation
 			@toggle-trackme="onToggleTrackme"
-			@toggle-slider="sliderEnabled = $event; sliderStart=0; sliderEnd=moment.unix()">
+			@toggle-slider="onToggleSlider">
 			<template #items>
 				<AppNavigationFavoritesItem
 					:enabled="favoritesEnabled"
@@ -333,7 +333,7 @@ export default {
 		displayedTracks() {
 			return this.sliderEnabled
 				? this.tracks.filter((t) => {
-					return !(t.metadata?.begin >= this.sliderEnd || t.metadata?.end <= this.sliderStart)
+					return !(t.metadata?.begin >= this.sliderEnd || (t.metadata?.end >= 0 && t.metadata?.end <= this.sliderStart))
 				})
 				: this.tracks
 		},
@@ -617,6 +617,11 @@ export default {
 				this.stopTrackLoop()
 			}
 		},
+		onToggleSlider(enabled) {
+			this.sliderEnabled = enabled
+			this.sliderStart = 0
+			this.sliderEnd = moment().unix()
+		},
 		sendPositionLoop() {
 			// start a loop which get and send my position
 			if (navigator.geolocation && window.isSecureContext) {