diff --git a/ui/src/playlist/PlaylistList.js b/ui/src/playlist/PlaylistList.js
index b8dde5cba..11629f956 100644
--- a/ui/src/playlist/PlaylistList.js
+++ b/ui/src/playlist/PlaylistList.js
@@ -20,7 +20,7 @@ const PlaylistFilter = (props) => (
 
 const PlaylistList = (props) => (
   <List {...props} exporter={false} filters={<PlaylistFilter />}>
-    <Datagrid rowClick="show" isRowSelectable={(r) => isWritable(r.owner)}>
+    <Datagrid rowClick="show" isRowSelectable={(r) => isWritable(r && r.owner)}>
       <TextField source="name" />
       <TextField source="owner" />
       <BooleanField source="public" />
diff --git a/ui/src/playlist/PlaylistSongs.js b/ui/src/playlist/PlaylistSongs.js
index 170aec790..4038de418 100644
--- a/ui/src/playlist/PlaylistSongs.js
+++ b/ui/src/playlist/PlaylistSongs.js
@@ -78,7 +78,11 @@ const PlaylistSongs = (props) => {
   const refresh = useRefresh()
   const notify = useNotify()
   const { bulkActionButtons, expand, className, playlistId, readOnly } = props
-  const { data, ids, version } = controllerProps
+  const { data, ids, version, total } = controllerProps
+
+  if (total === 0) {
+    return null
+  }
 
   const anySong = data[ids[0]]
   const showPlaceholder = !anySong || anySong.playlistId !== playlistId