diff --git a/src/renderer/features/now-playing/components/play-queue.tsx b/src/renderer/features/now-playing/components/play-queue.tsx
index 4598b2cc0..04643eebb 100644
--- a/src/renderer/features/now-playing/components/play-queue.tsx
+++ b/src/renderer/features/now-playing/components/play-queue.tsx
@@ -24,7 +24,7 @@ type QueueProps = {
 };
 
 export const PlayQueue = forwardRef(({ listKey, searchTerm }: QueueProps, ref: Ref<any>) => {
-    const { table } = useListSettings(listKey);
+    const { table } = useListSettings(listKey) || {};
 
     const queue = usePlayerQueue();
     const isFetching = useIsPlayerFetching();
diff --git a/src/renderer/features/shared/components/list-config-menu.tsx b/src/renderer/features/shared/components/list-config-menu.tsx
index 89dfe25fa..c4b0db0eb 100644
--- a/src/renderer/features/shared/components/list-config-menu.tsx
+++ b/src/renderer/features/shared/components/list-config-menu.tsx
@@ -82,7 +82,9 @@ interface ListConfigMenuProps {
 }
 
 export const ListConfigMenu = (props: ListConfigMenuProps) => {
-    const displayType = useSettingsStore((state) => state.lists[props.listKey].display);
+    const displayType = useSettingsStore(
+        (state) => state.lists[props.listKey]?.display,
+    ) as ListDisplayType;
     const { setList } = useSettingsStoreActions();
 
     return (