diff --git a/lnbits/extensions/livestream/crud.py b/lnbits/extensions/livestream/crud.py
index b918e9f1f..4784494c0 100644
--- a/lnbits/extensions/livestream/crud.py
+++ b/lnbits/extensions/livestream/crud.py
@@ -36,8 +36,8 @@ async def get_livestream(ls_id: int) -> Optional[Livestream]:
 async def get_livestream_by_track(track_id: int) -> Optional[Livestream]:
     row = await db.fetchone(
         """
-        SELECT livestreams.* FROM livestream.livestreams
-        INNER JOIN tracks ON tracks.livestream = livestreams.id
+        SELECT livestreams.* AS livestreams FROM livestream.livestreams
+        INNER JOIN livestream.tracks AS tracks ON tracks.livestream = livestreams.id
         WHERE tracks.id = ?
         """,
         (track_id,),
diff --git a/lnbits/extensions/livestream/models.py b/lnbits/extensions/livestream/models.py
index 630c658cf..1b5d4f7a7 100644
--- a/lnbits/extensions/livestream/models.py
+++ b/lnbits/extensions/livestream/models.py
@@ -75,10 +75,11 @@ class Track(BaseModel):
         if not self.download_url:
             return None
 
+        url = request.url_for("livestream.track_redirect_download", track_id=self.id)
+        url_with_query = f"{url}?p={payment_hash}"        
+
         return UrlAction(
-            url=request.url_for(
-                "livestream.track_redirect_download", track_id=self.id, p=payment_hash
-            ),
+            url=url_with_query,
             description=f"Download the track {self.name}!",
         )