diff --git a/internal/deezer/client.go b/internal/deezer/client.go
index 9461780..8e8c2a5 100644
--- a/internal/deezer/client.go
+++ b/internal/deezer/client.go
@@ -169,7 +169,10 @@ func (c *Client) GetMediaStream(ctx context.Context, media *Media, songID string
 		return nil, err
 	}
 
-	resp, err := c.Session.HttpClient.Do(req)
+	streamingClient := *c.Session.HttpClient
+	streamingClient.Timeout = 0
+
+	resp, err := streamingClient.Do(req)
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/deezer/song.go b/internal/deezer/song.go
index 75402e7..d28ea3d 100644
--- a/internal/deezer/song.go
+++ b/internal/deezer/song.go
@@ -40,10 +40,10 @@ func (s *Song) GetFileName(resourceType string, song *Song, media *Media) string
 	}
 	trackNumber := ""
 	if resourceType == "album" {
-		trackNumber = song.TrackNumber + "."
+		trackNumber = song.TrackNumber + ". "
 	}
 
-	fileName := fmt.Sprintf("%s %s - %s.%s", trackNumber, s.Artist, s.GetTitle(), ext)
+	fileName := fmt.Sprintf("%s%s - %s.%s", trackNumber, s.Artist, s.GetTitle(), ext)
 	fileName, _ = filenamify.Filenamify(fileName, filenamify.Options{})
 
 	return fileName