diff --git a/ui/src/dialogs/AddToPlaylistDialog.js b/ui/src/dialogs/AddToPlaylistDialog.js
index d4067e415..e96528083 100644
--- a/ui/src/dialogs/AddToPlaylistDialog.js
+++ b/ui/src/dialogs/AddToPlaylistDialog.js
@@ -25,7 +25,7 @@ const AddToPlaylistDialog = () => {
   const notify = useNotify()
   const [value, setValue] = useState({})
   const dataProvider = useDataProvider()
-  const [create] = useCreate(
+  const [createAndAddToPlaylist] = useCreate(
     'playlist',
     { name: value.name },
     {
@@ -74,7 +74,7 @@ const AddToPlaylistDialog = () => {
     if (value.id) {
       addToPlaylist(value.id)
     } else {
-      create()
+      createAndAddToPlaylist()
     }
     dispatch(closeAddToPlaylist())
     e.stopPropagation()
diff --git a/ui/src/dialogs/SelectPlaylistInput.js b/ui/src/dialogs/SelectPlaylistInput.js
index 40948894f..ef73c7a69 100644
--- a/ui/src/dialogs/SelectPlaylistInput.js
+++ b/ui/src/dialogs/SelectPlaylistInput.js
@@ -11,18 +11,14 @@ const filter = createFilterOptions()
 
 const SelectPlaylistInput = ({ onChange }) => {
   const translate = useTranslate()
-  const { ids, data, loaded } = useGetList(
+  const { ids, data } = useGetList(
     'playlist',
     { page: 1, perPage: -1 },
     { field: 'name', order: 'ASC' },
     {}
   )
 
-  if (!loaded) {
-    return null
-  }
-
-  const options = ids.map((id) => data[id])
+  const options = ids && ids.map((id) => data[id])
 
   const handleOnChange = (event, newValue) => {
     if (newValue == null) {