diff --git a/Emby.Server.Implementations/Playlists/PlaylistManager.cs b/Emby.Server.Implementations/Playlists/PlaylistManager.cs
index c15c2c4008..853daf7247 100644
--- a/Emby.Server.Implementations/Playlists/PlaylistManager.cs
+++ b/Emby.Server.Implementations/Playlists/PlaylistManager.cs
@@ -530,7 +530,7 @@ namespace Emby.Server.Implementations.Playlists
                 _libraryManager.GetUserRootFolder().Children.OfType<Folder>().FirstOrDefault(i => string.Equals(i.GetType().Name, TypeName, StringComparison.Ordinal));
         }
 
-        public async Task RemovePlaylists(Guid userId)
+        public async Task RemovePlaylistsAsync(Guid userId)
         {
             var playlists = GetPlaylists(userId);
             foreach (var playlist in playlists)
@@ -564,7 +564,7 @@ namespace Emby.Server.Implementations.Playlists
             }
         }
 
-        public async Task UpdatePlaylist(Playlist playlist)
+        public async Task UpdatePlaylistAsync(Playlist playlist)
         {
             var currentPlaylist = (Playlist)_libraryManager.GetItemById(playlist.Id);
             currentPlaylist.OwnerUserId = playlist.OwnerUserId;
@@ -572,7 +572,7 @@ namespace Emby.Server.Implementations.Playlists
 
             await playlist.UpdateToRepositoryAsync(ItemUpdateType.MetadataEdit, CancellationToken.None).ConfigureAwait(false);
 
-            if (playlist.IsFile)
+            if (currentPlaylist.IsFile)
             {
                 SavePlaylistFile(currentPlaylist);
             }
diff --git a/Jellyfin.Api/Controllers/UserController.cs b/Jellyfin.Api/Controllers/UserController.cs
index 09bf895505..e495288670 100644
--- a/Jellyfin.Api/Controllers/UserController.cs
+++ b/Jellyfin.Api/Controllers/UserController.cs
@@ -158,7 +158,7 @@ public class UserController : BaseJellyfinApiController
         }
 
         await _sessionManager.RevokeUserTokens(user.Id, null).ConfigureAwait(false);
-        await _playlistManager.RemovePlaylists(userId).ConfigureAwait(false);
+        await _playlistManager.RemovePlaylistsAsync(userId).ConfigureAwait(false);
         await _userManager.DeleteUserAsync(userId).ConfigureAwait(false);
         return NoContent();
     }
diff --git a/Jellyfin.Server/Migrations/Routines/FixPlaylistOwner.cs b/Jellyfin.Server/Migrations/Routines/FixPlaylistOwner.cs
index d5736fd3c3..55aadae79a 100644
--- a/Jellyfin.Server/Migrations/Routines/FixPlaylistOwner.cs
+++ b/Jellyfin.Server/Migrations/Routines/FixPlaylistOwner.cs
@@ -59,7 +59,7 @@ internal class FixPlaylistOwner : IMigrationRoutine
                     playlist.OwnerUserId = guid;
                     playlist.Shares = shares.Where(x => x != firstEditShare).ToArray();
 
-                    _playlistManager.UpdatePlaylist(playlist).GetAwaiter().GetResult();
+                    _playlistManager.UpdatePlaylistAsync(playlist).GetAwaiter().GetResult();
                 }
             }
         }
diff --git a/MediaBrowser.Controller/Playlists/IPlaylistManager.cs b/MediaBrowser.Controller/Playlists/IPlaylistManager.cs
index 22f974420f..d889436629 100644
--- a/MediaBrowser.Controller/Playlists/IPlaylistManager.cs
+++ b/MediaBrowser.Controller/Playlists/IPlaylistManager.cs
@@ -63,13 +63,13 @@ namespace MediaBrowser.Controller.Playlists
         /// </summary>
         /// <param name="userId">The user id.</param>
         /// <returns>Task.</returns>
-        Task RemovePlaylists(Guid userId);
+        Task RemovePlaylistsAsync(Guid userId);
 
         /// <summary>
         /// Updates a playlist.
         /// </summary>
         /// <param name="playlist">The updated playlist.</param>
         /// <returns>Task.</returns>
-        Task UpdatePlaylist(Playlist playlist);
+        Task UpdatePlaylistAsync(Playlist playlist);
     }
 }
diff --git a/MediaBrowser.Controller/Playlists/Playlist.cs b/MediaBrowser.Controller/Playlists/Playlist.cs
index 2ed05a32c0..344e996ea8 100644
--- a/MediaBrowser.Controller/Playlists/Playlist.cs
+++ b/MediaBrowser.Controller/Playlists/Playlist.cs
@@ -233,7 +233,8 @@ namespace MediaBrowser.Controller.Playlists
                 return base.IsVisible(user);
             }
 
-            if (user.Id.Equals(OwnerUserId))
+            var userId = user.Id;
+            if (userId.Equals(OwnerUserId))
             {
                 return true;
             }
@@ -241,10 +242,9 @@ namespace MediaBrowser.Controller.Playlists
             var shares = Shares;
             if (shares.Length == 0)
             {
-                return base.IsVisible(user);
+                return false;
             }
 
-            var userId = user.Id;
             return shares.Any(share => Guid.TryParse(share.UserId, out var id) && id.Equals(userId));
         }