diff --git a/src/N_m3u8DL-RE/DownloadManager/SimpleLiveRecordManager2.cs b/src/N_m3u8DL-RE/DownloadManager/SimpleLiveRecordManager2.cs
index 3733300..1bdd8ea 100644
--- a/src/N_m3u8DL-RE/DownloadManager/SimpleLiveRecordManager2.cs
+++ b/src/N_m3u8DL-RE/DownloadManager/SimpleLiveRecordManager2.cs
@@ -584,7 +584,7 @@ namespace N_m3u8DL_RE.DownloadManager
 
         private string GetPath(string url)
         {
-            return new Uri(url).GetLeftPart(UriPartial.Path);
+            return url.Split('?').First();
         }
 
         public async Task<bool> StartRecordAsync()
diff --git a/src/N_m3u8DL-RE/Util/OtherUtil.cs b/src/N_m3u8DL-RE/Util/OtherUtil.cs
index 59b729c..69c602c 100644
--- a/src/N_m3u8DL-RE/Util/OtherUtil.cs
+++ b/src/N_m3u8DL-RE/Util/OtherUtil.cs
@@ -82,9 +82,8 @@ namespace N_m3u8DL_RE.Util
             }
             else
             {
-                var uri = new Uri(input);
-                var name = uri.GetLeftPart(UriPartial.Path).Split('/').Last();
-                name = string.Join(".", name.Split('.').SkipLast(1)).Trim('.');
+                var uri = new Uri(input.Split('?').First());
+                var name = Path.GetFileNameWithoutExtension(uri.LocalPath);
                 saveName = GetValidFileName(name) + "_" + saveName;
             }
             return saveName;