diff --git a/src/components/Main.vue b/src/components/Main.vue
index 4719754..6c955d6 100644
--- a/src/components/Main.vue
+++ b/src/components/Main.vue
@@ -236,10 +236,6 @@ export default {
 					vm.$store.dispatch('isPlaying', false)
 					vm.$store.dispatch('isBuffering', true)
 				},
-				onloaderror() {
-					showError(t('radio', 'Unable to reach and play radio station'))
-					vm.$store.dispatch('isBuffering', false)
-				},
 			})
 			audioPlayer.play()
 			audioPlayer.fade(0, vm.player.volume, 500)
diff --git a/src/components/Table.vue b/src/components/Table.vue
index 9f48816..4989974 100644
--- a/src/components/Table.vue
+++ b/src/components/Table.vue
@@ -10,49 +10,67 @@
 			</tr>
 		</thead>
 		<tbody>
-			<tr
-				v-for="(station, idx) in stationData"
-				:key="idx"
-				:class="{ selected: idx === activeItem}">
-				<td @click="doPlay(idx, station)">
-					<blur-hash-image
-						class="stationIcon"
-						width="32"
-						height="32"
-						:hash="station.blurHash"
-						:src="station.favicon" />
-					<span :class="{ 'icon-starred': favorites.flat().includes(station.stationuuid) }" />
-				</td>
-				<td class="nameColumn" @click="doPlay(idx, station)">
-					<span class="innernametext">
-						{{ station.name }}
-					</span>
-				</td>
-				<td class="actionColumn">
-					<Actions>
-						<ActionButton
-							v-if="!favorites.flat().includes(station.stationuuid)"
-							icon="icon-star"
-							:close-after-click="true"
-							@click="doFavor(idx, station)">
-							{{ t('radio', 'Add to favorites') }}
-						</ActionButton>
-						<ActionButton
-							v-if="favorites.flat().includes(station.stationuuid)"
-							icon="icon-star"
-							:close-after-click="true"
-							@click="doFavor(idx, station)">
-							{{ t('radio', 'Remove from favorites') }}
-						</ActionButton>
-						<ActionButton
-							icon="icon-info"
-							:close-after-click="true"
-							@click="toggleSidebar(station)">
-							{{ t('radio', 'Details') }}
-						</ActionButton>
-					</Actions>
-				</td>
-			</tr>
+			<template v-if="stationData[0].type!=='folder'">
+				<tr
+					v-for="(station, idx) in stationData"
+					:key="idx"
+					:class="{ selected: idx === activeItem}">
+					<td @click="doPlay(idx, station)">
+						<blur-hash-image
+							class="stationIcon"
+							width="32"
+							height="32"
+							:hash="station.blurHash"
+							:src="station.favicon" />
+						<span :class="{ 'icon-starred': favorites.flat().includes(station.stationuuid) }" />
+					</td>
+					<td class="nameColumn" @click="doPlay(idx, station)">
+						<span class="innernametext">
+							{{ station.name }}
+						</span>
+					</td>
+					<td class="actionColumn">
+						<Actions>
+							<ActionButton
+								v-if="!favorites.flat().includes(station.stationuuid)"
+								icon="icon-star"
+								:close-after-click="true"
+								@click="doFavor(idx, station)">
+								{{ t('radio', 'Add to favorites') }}
+							</ActionButton>
+							<ActionButton
+								v-if="favorites.flat().includes(station.stationuuid)"
+								icon="icon-star"
+								:close-after-click="true"
+								@click="doFavor(idx, station)">
+								{{ t('radio', 'Remove from favorites') }}
+							</ActionButton>
+							<ActionButton
+								icon="icon-info"
+								:close-after-click="true"
+								@click="toggleSidebar(station)">
+								{{ t('radio', 'Details') }}
+							</ActionButton>
+						</Actions>
+					</td>
+				</tr>
+			</template>
+			<template v-if="stationData[0].type==='folder'">
+				<tr
+					v-for="(station, idx) in stationData"
+					:key="idx"
+					@click="doPlay(idx, station)">
+					<td>
+						<span class="icon-folder" />
+					</td>
+					<td class="nameColumn">
+						<span class="innernametext">
+							{{ station.name }}
+						</span>
+					</td>
+					<td class="actionColumn" />
+				</tr>
+			</template>
 		</tbody>
 	</table>
 </template>
@@ -151,6 +169,13 @@ table {
 			background-repeat: no-repeat;
 			border-bottom: 1px solid var(--color-border);
 			cursor: pointer;
+
+			span.icon-folder {
+				display: block;
+				background-size: cover;
+				width: 30px;
+				height: 30px;
+			}
 		}
 
 		tr {