diff --git a/src/components/merge/DownloadLink.tsx b/src/components/merge/DownloadLink.tsx
index 9896560..4de2f5a 100644
--- a/src/components/merge/DownloadLink.tsx
+++ b/src/components/merge/DownloadLink.tsx
@@ -28,7 +28,7 @@ const DownloadLink: React.FC<DownloadLinkProps> = ({
         '?mode=dl&type=' +
         type +
         (optimizeWaypoints ? '&mode=opt' : '') +
-        (trackname.length > 0 ? `&name=${trackname}` : '') +
+        (trackname.length > 0 ? `&name=${encodeToBase64(trackname)}` : '') +
         (geoJson != null
           ? `&wp=${encodeToBase64(JSON.stringify(geoJson))}`
           : '')
diff --git a/src/components/merge/TrackHeader.tsx b/src/components/merge/TrackHeader.tsx
index 37e92c3..1851096 100644
--- a/src/components/merge/TrackHeader.tsx
+++ b/src/components/merge/TrackHeader.tsx
@@ -1,7 +1,7 @@
 import DownloadLink from './DownloadLink.tsx'
 import { FaCircleInfo, FaPenToSquare } from 'react-icons/fa6'
 import ContentEditable, { ContentEditableEvent } from 'react-contenteditable'
-import React, { useEffect, useMemo, useRef, useState } from 'react'
+import React, { useMemo, useRef, useState } from 'react'
 import { WayPoint } from '../../@types/gps.ts'
 import { generateGeoJson, sanitizeFilename } from '../common/tools.ts'
 import ResetButton from './ResetButton.tsx'
@@ -27,7 +27,7 @@ const TrackHeader: React.FC<TrackHeaderProps> = ({
     [markerPositions]
   )
 
-  useEffect(() => {
+  useMemo(() => {
     tracknameRef.current = trackname
   }, [])