diff --git a/main.go b/main.go
index a44f588..27a2781 100644
--- a/main.go
+++ b/main.go
@@ -1080,11 +1080,17 @@ func rip(albumId string, token string, storefront string, userToken string) erro
 	if strings.HasSuffix(singerFoldername, ".") {
 		singerFoldername = strings.ReplaceAll(singerFoldername, ".", "")
 	}
+	if strings.HasSuffix(singerFoldername, " ") {
+		singerFoldername = strings.TrimSpace(singerFoldername)
+	}
 	singerFolder := filepath.Join("AM-DL downloads", forbiddenNames.ReplaceAllString(singerFoldername, "_"))
 	albumFolder := fmt.Sprintf("%s", meta.Data[0].Attributes.Name)
 	if strings.HasSuffix(albumFolder, ".") {
 		albumFolder = strings.ReplaceAll(albumFolder, ".", "")
 	}
+	if strings.HasSuffix(albumFolder, " ") {
+		albumFolder = strings.TrimSpace(albumFolder)
+	}
 	sanAlbumFolder := filepath.Join(singerFolder, forbiddenNames.ReplaceAllString(albumFolder, "_"))
 	os.MkdirAll(sanAlbumFolder, os.ModePerm)
 	fmt.Println(singerFoldername)
diff --git a/main_atmos.go b/main_atmos.go
index 9d075bd..2b8b1ac 100644
--- a/main_atmos.go
+++ b/main_atmos.go
@@ -1086,11 +1086,17 @@ func rip(albumId string, token string, storefront string, userToken string) erro
 	if strings.HasSuffix(singerFoldername, ".") {
 		singerFoldername = strings.ReplaceAll(singerFoldername, ".", "")
 	}
+	if strings.HasSuffix(singerFoldername, " ") {
+		singerFoldername = strings.TrimSpace(singerFoldername)
+	}
 	singerFolder := filepath.Join("AM-DL-Atmos downloads", forbiddenNames.ReplaceAllString(singerFoldername, "_"))
 	albumFolder := fmt.Sprintf("%s [Atmos]", meta.Data[0].Attributes.Name)
 	if strings.HasSuffix(albumFolder, ".") {
 		albumFolder = strings.ReplaceAll(albumFolder, ".", "")
 	}
+	if strings.HasSuffix(albumFolder, " ") {
+		albumFolder = strings.TrimSpace(albumFolder)
+	}
 	sanAlbumFolder := filepath.Join(singerFolder, forbiddenNames.ReplaceAllString(albumFolder, "_"))
 	os.MkdirAll(sanAlbumFolder, os.ModePerm)
 	fmt.Println(singerFoldername)
diff --git a/main_select.go b/main_select.go
index 0f85108..bea4d09 100644
--- a/main_select.go
+++ b/main_select.go
@@ -1089,11 +1089,17 @@ func rip(albumId string, token string, storefront string, userToken string) erro
 	if strings.HasSuffix(singerFoldername, ".") {
 		singerFoldername = strings.ReplaceAll(singerFoldername, ".", "")
 	}
+	if strings.HasSuffix(singerFoldername, " ") {
+		singerFoldername = strings.TrimSpace(singerFoldername)
+	}
 	singerFolder := filepath.Join("AM-DL downloads", forbiddenNames.ReplaceAllString(singerFoldername, "_"))
 	albumFolder := fmt.Sprintf("%s", meta.Data[0].Attributes.Name)
 	if strings.HasSuffix(albumFolder, ".") {
 		albumFolder = strings.ReplaceAll(albumFolder, ".", "")
 	}
+	if strings.HasSuffix(albumFolder, " ") {
+		albumFolder = strings.TrimSpace(albumFolder)
+	}
 	sanAlbumFolder := filepath.Join(singerFolder, forbiddenNames.ReplaceAllString(albumFolder, "_"))
 	os.MkdirAll(sanAlbumFolder, os.ModePerm)
 	fmt.Println(singerFoldername)