diff --git a/web/app/assets/javascripts/react-components/PopupJamTrackMixdownDownload.js.jsx.coffee b/web/app/assets/javascripts/react-components/PopupJamTrackMixdownDownload.js.jsx.coffee
index d0e812940..245ee6c15 100644
--- a/web/app/assets/javascripts/react-components/PopupJamTrackMixdownDownload.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/PopupJamTrackMixdownDownload.js.jsx.coffee
@@ -69,7 +69,7 @@ JamTrackPlayerStore = reactContext.JamTrackPlayerStore
 
     new window.Fingerprint2().get((result, components) => (
       redirectTo = "/api/mixdowns/#{@state.mixdown.id}/download.mp3?file_type=mp3&sample_rate=#{@sampleRate}&download=1&mark=#{result}"
-      redirectTo = URI.escape(redirectTo)
+      redirectTo = encodeURIComponent(redirectTo)
       AppActions.openExternalUrl(window.location.protocol + '//' + window.location.host + "/signin?redirect-to=#{redirectTo}")
     ))
 
diff --git a/web/app/assets/javascripts/react-components/PopupMediaControls.js.jsx.coffee b/web/app/assets/javascripts/react-components/PopupMediaControls.js.jsx.coffee
index aedc93dba..63da519aa 100644
--- a/web/app/assets/javascripts/react-components/PopupMediaControls.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/PopupMediaControls.js.jsx.coffee
@@ -546,7 +546,7 @@ mixins.push(Reflux.listenTo(UserStore, 'onUserChanged'))
 
       new window.Fingerprint2().get((result, components) => (
         redirectTo = "/api/jamtracks/#{@state.jamTrackState.jamTrack.id}/stems/#{selectedTrackId}/download.mp3?file_type=mp3&download=1&mark=#{result}"
-        redirectTo = URI.escape(redirectTo)
+        redirectTo = encodeURIComponent(redirectTo)
         AppActions.openExternalUrl(window.location.protocol + '//' + window.location.host + "/signin?redirect-to=#{redirectTo}")
       ))
 
@@ -591,7 +591,7 @@ mixins.push(Reflux.listenTo(UserStore, 'onUserChanged'))
     if browserPackage?.signing_state == 'SIGNED'
       new window.Fingerprint2().get((result, components) => (
         redirectTo = "/api/mixdowns/#{mixdown.id}/download.mp3?file_type=mp3&sample_rate=48&download=1&mark=#{result}"
-        redirectTo = URI.escape(redirectTo)
+        redirectTo = encodeURIComponent(redirectTo)
         AppActions.openExternalUrl(window.location.protocol + '//' + window.location.host + "/signin?redirect-to=#{redirectTo}")
       ))
     else