diff --git a/dist/plex-meets-homeassistant.js b/dist/plex-meets-homeassistant.js
index fb141d9..52d9307 100644
--- a/dist/plex-meets-homeassistant.js
+++ b/dist/plex-meets-homeassistant.js
@@ -20848,7 +20848,10 @@ class PlexMeetsHomeAssistantEditor extends HTMLElement {
                         typeItems.appendChild(addDropdownItem('', ''));
                         let typeAvailable = false;
                         lodash.forEach(types, (sectionType) => {
-                            if (sectionType.type !== 'track' && sectionType.type !== 'episode') {
+                            if (sectionType.type !== 'track' &&
+                                sectionType.type !== 'episode' &&
+                                (sectionType.type !== 'folder' ||
+                                    (sectionType.type === 'folder' && lodash.isEqual(lodash.get(libraryData, '[0].viewGroup'), 'artist')))) {
                                 let key = sectionType.key.split('type=')[1];
                                 if (sectionType.type === 'folder') {
                                     key = 'folder';
diff --git a/src/editor.ts b/src/editor.ts
index ba5abfa..8d5fb66 100644
--- a/src/editor.ts
+++ b/src/editor.ts
@@ -797,7 +797,12 @@ class PlexMeetsHomeAssistantEditor extends HTMLElement {
 					typeItems.appendChild(addDropdownItem('', ''));
 					let typeAvailable = false;
 					_.forEach(types, (sectionType: Record<string, any>) => {
-						if (sectionType.type !== 'track' && sectionType.type !== 'episode') {
+						if (
+							sectionType.type !== 'track' &&
+							sectionType.type !== 'episode' &&
+							(sectionType.type !== 'folder' ||
+								(sectionType.type === 'folder' && _.isEqual(_.get(libraryData, '[0].viewGroup'), 'artist')))
+						) {
 							let key = sectionType.key.split('type=')[1];
 							if (sectionType.type === 'folder') {
 								key = 'folder';