diff --git a/lib/channels/views/components/info.dart b/lib/channels/views/components/info.dart
index e4736cf8..2cdbf4d5 100644
--- a/lib/channels/views/components/info.dart
+++ b/lib/channels/views/components/info.dart
@@ -1,15 +1,15 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:flutter_linkify/flutter_linkify.dart';
 import 'package:clipious/channels/models/channel.dart';
 import 'package:clipious/globals.dart';
 import 'package:clipious/utils.dart';
+import 'package:clipious/utils/views/components/thumbnail.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:flutter_linkify/flutter_linkify.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import '../../../subscription_management/view/components/subscribe_button.dart';
 import '../../../utils/models/image_object.dart';
 import '../../../videos/views/components/video_in_list.dart';
-import '../../../videos/views/components/video_thumbnail.dart';
 
 class ChannelInfo extends StatelessWidget {
   final Channel channel;
@@ -30,9 +30,8 @@ class ChannelInfo extends StatelessWidget {
           Thumbnail(
               width: 50,
               height: 50,
-              thumbnailUrl:
-                  ImageObject.getBestThumbnail(channel.authorThumbnails)?.url ??
-                      '',
+              thumbnails: ImageObject.getThumbnailUrlsByPreferredOrder(
+                  channel.authorThumbnails),
               decoration: BoxDecoration(
                 color: colors.secondaryContainer,
                 shape: BoxShape.circle,
@@ -104,7 +103,7 @@ class ChannelInfo extends StatelessWidget {
                 height: deviceType == DeviceType.phone ? 100 : 230,
                 child: Thumbnail(
                     width: double.infinity,
-                    thumbnailUrl: bannerUrl,
+                    thumbnails: [bannerUrl],
                     decoration: BoxDecoration(
                         color: colors.secondaryContainer,
                         borderRadius: BorderRadius.circular(10))),
diff --git a/lib/channels/views/tv/screens/channel.dart b/lib/channels/views/tv/screens/channel.dart
index 478b0e72..56c696f0 100644
--- a/lib/channels/views/tv/screens/channel.dart
+++ b/lib/channels/views/tv/screens/channel.dart
@@ -2,10 +2,6 @@ import 'dart:ui';
 
 import 'package:auto_route/annotations.dart';
 import 'package:cached_network_image/cached_network_image.dart';
-import 'package:clipious/videos/models/video.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:clipious/app/views/tv/screens/tv_home.dart';
 import 'package:clipious/channels/states/channel.dart';
 import 'package:clipious/globals.dart';
@@ -13,14 +9,18 @@ import 'package:clipious/subscription_management/view/tv/tv_subscribe_button.dar
 import 'package:clipious/utils/models/image_object.dart';
 import 'package:clipious/utils/models/paginated_list.dart';
 import 'package:clipious/utils/views/components/placeholders.dart';
+import 'package:clipious/utils/views/components/thumbnail.dart';
 import 'package:clipious/utils/views/tv/components/tv_expandable_text.dart';
 import 'package:clipious/utils/views/tv/components/tv_horizontal_item_list.dart';
 import 'package:clipious/utils/views/tv/components/tv_overscan.dart';
+import 'package:clipious/videos/models/video.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 import '../../../../playlists/models/playlist.dart';
 import '../../../../playlists/views/components/playlist_in_list.dart';
 import '../../../../utils.dart';
-import '../../../../videos/views/components/video_thumbnail.dart';
 import '../../../states/tv_channel.dart';
 
 @RoutePage()
@@ -119,12 +119,11 @@ class TvChannelScreen extends StatelessWidget {
                                                           MainAxisSize.min,
                                                       children: [
                                                         Thumbnail(
-                                                          thumbnailUrl:
-                                                              ImageObject.getBestThumbnail(channel
-                                                                          .channel
-                                                                          ?.authorThumbnails)
-                                                                      ?.url ??
-                                                                  '',
+                                                          thumbnails: ImageObject
+                                                              .getThumbnailUrlsByPreferredOrder(
+                                                                  channel
+                                                                      .channel
+                                                                      ?.authorThumbnails),
                                                           width: 70,
                                                           height: 70,
                                                           decoration: BoxDecoration(
diff --git a/lib/comments/views/components/comment.dart b/lib/comments/views/components/comment.dart
index de13436a..73cd0a23 100644
--- a/lib/comments/views/components/comment.dart
+++ b/lib/comments/views/components/comment.dart
@@ -1,13 +1,13 @@
 import 'package:auto_route/auto_route.dart';
-import 'package:clipious/videos/models/video.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:clipious/comments/states/single_comment.dart';
 import 'package:clipious/comments/views/components/comments.dart';
 import 'package:clipious/router.dart';
 import 'package:clipious/utils/views/components/text_linkified.dart';
-import 'package:clipious/videos/views/components/video_thumbnail.dart';
+import 'package:clipious/utils/views/components/thumbnail.dart';
+import 'package:clipious/videos/models/video.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 import '../../../player/states/player.dart';
 import '../../../utils/models/image_object.dart';
@@ -49,10 +49,8 @@ class SingleCommentView extends StatelessWidget {
                     child: Thumbnail(
                       width: 20,
                       height: 20,
-                      thumbnailUrl: ImageObject.getBestThumbnail(
-                                  state.comment.authorThumbnails)
-                              ?.url ??
-                          '',
+                      thumbnails: ImageObject.getThumbnailUrlsByPreferredOrder(
+                          state.comment.authorThumbnails),
                       decoration: BoxDecoration(
                           borderRadius: BorderRadius.circular(20)),
                     ),
diff --git a/lib/home/models/db/home_layout.g.dart b/lib/home/models/db/home_layout.g.dart
index 3ae74a5d..f2685a12 100644
--- a/lib/home/models/db/home_layout.g.dart
+++ b/lib/home/models/db/home_layout.g.dart
@@ -20,9 +20,9 @@ abstract class _$HomeLayoutCWProxy {
   /// HomeLayout(...).copyWith(id: 12, name: "My name")
   /// ````
   HomeLayout call({
-    List<HomeDataSource>? smallSources,
-    HomeDataSource? bigSource,
-    bool? showBigSource,
+    List<HomeDataSource> smallSources,
+    HomeDataSource bigSource,
+    bool showBigSource,
   });
 }
 
@@ -57,15 +57,15 @@ class _$HomeLayoutCWProxyImpl implements _$HomeLayoutCWProxy {
     Object? showBigSource = const $CopyWithPlaceholder(),
   }) {
     return HomeLayout._(
-      smallSources == const $CopyWithPlaceholder() || smallSources == null
+      smallSources == const $CopyWithPlaceholder()
           ? _value.smallSources
           // ignore: cast_nullable_to_non_nullable
           : smallSources as List<HomeDataSource>,
-      bigSource == const $CopyWithPlaceholder() || bigSource == null
+      bigSource == const $CopyWithPlaceholder()
           ? _value.bigSource
           // ignore: cast_nullable_to_non_nullable
           : bigSource as HomeDataSource,
-      showBigSource == const $CopyWithPlaceholder() || showBigSource == null
+      showBigSource == const $CopyWithPlaceholder()
           ? _value.showBigSource
           // ignore: cast_nullable_to_non_nullable
           : showBigSource as bool,
diff --git a/lib/player/views/components/audio_player.dart b/lib/player/views/components/audio_player.dart
index c4453419..b50f2538 100644
--- a/lib/player/views/components/audio_player.dart
+++ b/lib/player/views/components/audio_player.dart
@@ -1,9 +1,8 @@
-import 'package:clipious/utils/models/image_object.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:clipious/player/views/components/player_controls.dart';
 import 'package:clipious/settings/states/settings.dart';
 import 'package:clipious/videos/views/components/offline_video_thumbnail.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 
 import '../../../downloads/models/downloaded_video.dart';
 import '../../../videos/models/video.dart';
@@ -49,11 +48,7 @@ class AudioPlayer extends StatelessWidget {
                     ? VideoThumbnailView(
                         decoration: const BoxDecoration(),
                         videoId: playerState.video!.videoId,
-                        thumbnailUrl: playerState.video?.deArrowThumbnailUrl ??
-                            ImageObject.getBestThumbnail(
-                                    playerState.video?.videoThumbnails ?? [])
-                                ?.url ??
-                            '',
+                        thumbnails: playerState.video?.thumbnails ?? [],
                       )
                     : playerState.offlineVideo != null
                         ? OfflineVideoThumbnail(
diff --git a/lib/player/views/tv/components/player_controls.dart b/lib/player/views/tv/components/player_controls.dart
index f43d9f8c..889ac9f9 100644
--- a/lib/player/views/tv/components/player_controls.dart
+++ b/lib/player/views/tv/components/player_controls.dart
@@ -1,18 +1,18 @@
-import 'package:clipious/videos/models/video.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:clipious/player/states/tv_player_controls.dart';
 import 'package:clipious/player/views/tv/components/player_settings.dart';
+import 'package:clipious/utils/views/components/thumbnail.dart';
 import 'package:clipious/utils/views/tv/components/tv_button.dart';
 import 'package:clipious/utils/views/tv/components/tv_horizontal_item_list.dart';
 import 'package:clipious/utils/views/tv/components/tv_overscan.dart';
+import 'package:clipious/videos/models/video.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 import '../../../../globals.dart';
 import '../../../../utils.dart';
 import '../../../../utils/models/image_object.dart';
 import '../../../../utils/models/paginated_list.dart';
-import '../../../../videos/views/components/video_thumbnail.dart';
 import '../../../states/player.dart';
 
 class TvPlayerControls extends StatelessWidget {
@@ -107,12 +107,10 @@ class TvPlayerControls extends StatelessWidget {
                                         mainAxisSize: MainAxisSize.min,
                                         children: [
                                           Thumbnail(
-                                            thumbnailUrl:
-                                                ImageObject.getBestThumbnail(
-                                                            currentlyPlaying
-                                                                ?.authorThumbnails)
-                                                        ?.url ??
-                                                    '',
+                                            thumbnails: ImageObject
+                                                .getThumbnailUrlsByPreferredOrder(
+                                                    currentlyPlaying
+                                                        ?.authorThumbnails),
                                             width: 40,
                                             height: 40,
                                             decoration: BoxDecoration(
diff --git a/lib/playlists/views/components/playlist_in_list.dart b/lib/playlists/views/components/playlist_in_list.dart
index cfda568f..ecde0610 100644
--- a/lib/playlists/views/components/playlist_in_list.dart
+++ b/lib/playlists/views/components/playlist_in_list.dart
@@ -70,7 +70,6 @@ class PlaylistInList extends StatelessWidget {
                           padding: const EdgeInsets.all(8.0),
                           child: PlaylistThumbnails(
                             videos: state.videos,
-                            bestThumbnails: isTv,
                           ),
                         )),
                     Text(
@@ -118,7 +117,6 @@ class PlaylistInList extends StatelessWidget {
                                         height: 140,
                                         child: PlaylistThumbnails(
                                           videos: state.videos,
-                                          bestThumbnails: isTv,
                                         )),
                                     Expanded(
                                         child: Text(
@@ -152,7 +150,6 @@ class PlaylistInList extends StatelessWidget {
                   children: [
                     PlaylistThumbnails(
                       videos: state.videos,
-                      bestThumbnails: isTv,
                     ),
                     Text(
                       playlist.title,
@@ -181,7 +178,6 @@ class PlaylistInList extends StatelessWidget {
                           padding: const EdgeInsets.all(8.0),
                           child: PlaylistThumbnails(
                             videos: state.videos,
-                            bestThumbnails: isTv,
                           ),
                         )),
                     Expanded(
diff --git a/lib/playlists/views/components/playlist_inner_view.dart b/lib/playlists/views/components/playlist_inner_view.dart
index 1e25a50d..e6b5c808 100644
--- a/lib/playlists/views/components/playlist_inner_view.dart
+++ b/lib/playlists/views/components/playlist_inner_view.dart
@@ -42,7 +42,6 @@ class PlaylistInnerView extends StatelessWidget {
                           height: 250,
                           child: PlaylistThumbnails(
                             videos: playlistState.playlist.videos,
-                            bestThumbnails: true,
                             children: playlistState.loading
                                 ? [
                                     Center(
diff --git a/lib/playlists/views/components/playlist_thumbnail.dart b/lib/playlists/views/components/playlist_thumbnail.dart
index 27a5d689..36236e63 100644
--- a/lib/playlists/views/components/playlist_thumbnail.dart
+++ b/lib/playlists/views/components/playlist_thumbnail.dart
@@ -1,15 +1,13 @@
-import 'package:clipious/videos/models/video.dart';
-import 'package:flutter/material.dart';
 import 'package:clipious/globals.dart';
 import 'package:clipious/utils/views/components/placeholders.dart';
+import 'package:clipious/videos/models/video.dart';
+import 'package:flutter/material.dart';
 
-import '../../../utils/models/image_object.dart';
 import '../../../videos/views/components/video_thumbnail.dart';
 
 class PlaylistThumbnails extends StatelessWidget {
   final List<Video> videos;
   final List<Widget>? children;
-  final bool bestThumbnails;
   final double scale = 0.7;
   final int maxThumbs;
   final bool isPlaceHolder;
@@ -18,7 +16,6 @@ class PlaylistThumbnails extends StatelessWidget {
       {super.key,
       required this.videos,
       this.children,
-      this.bestThumbnails = false,
       this.maxThumbs = 4,
       this.isPlaceHolder = false});
 
@@ -50,16 +47,7 @@ class PlaylistThumbnails extends StatelessWidget {
                       : videosToUse.length > i
                           ? VideoThumbnailView(
                               videoId: videosToUse[i].videoId,
-                              thumbnailUrl: videosToUse[i]
-                                      .deArrowThumbnailUrl ??
-                                  (bestThumbnails
-                                      ? ImageObject.getBestThumbnail(
-                                              videosToUse[i].videoThumbnails)
-                                          ?.url
-                                      : ImageObject.getWorstThumbnail(
-                                              videosToUse[i].videoThumbnails)
-                                          ?.url) ??
-                                  '',
+                              thumbnails: videosToUse[i].thumbnails,
                             )
                           : const SizedBox.shrink(),
                   secondChild: Container(
diff --git a/lib/playlists/views/tablet/playlist_inner_view.dart b/lib/playlists/views/tablet/playlist_inner_view.dart
index 00582733..715427a9 100644
--- a/lib/playlists/views/tablet/playlist_inner_view.dart
+++ b/lib/playlists/views/tablet/playlist_inner_view.dart
@@ -87,7 +87,6 @@ class TabletPlaylistInnerView extends StatelessWidget {
                             : 275,
                         child: PlaylistThumbnails(
                           videos: playlistState.playlist.videos,
-                          bestThumbnails: true,
                           children: playlistState.loading
                               ? [
                                   Center(
diff --git a/lib/playlists/views/tv/screens/playlist.dart b/lib/playlists/views/tv/screens/playlist.dart
index a9a6b6ef..278fd12e 100644
--- a/lib/playlists/views/tv/screens/playlist.dart
+++ b/lib/playlists/views/tv/screens/playlist.dart
@@ -2,10 +2,6 @@ import 'dart:ui';
 
 import 'package:auto_route/auto_route.dart';
 import 'package:carousel_slider/carousel_slider.dart';
-import 'package:clipious/videos/models/video.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:clipious/app/views/tv/screens/tv_home.dart';
 import 'package:clipious/globals.dart';
 import 'package:clipious/playlists/states/playlist.dart';
@@ -14,10 +10,13 @@ import 'package:clipious/router.dart';
 import 'package:clipious/utils/views/components/placeholders.dart';
 import 'package:clipious/utils/views/tv/components/tv_button.dart';
 import 'package:clipious/utils/views/tv/components/tv_overscan.dart';
+import 'package:clipious/videos/models/video.dart';
 import 'package:clipious/videos/views/tv/components/video_item.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 import '../../../../player/states/player.dart';
-import '../../../../utils/models/image_object.dart';
 import '../../../../videos/views/components/video_thumbnail.dart';
 
 @RoutePage()
@@ -57,11 +56,7 @@ class TvPlaylistScreen extends PlaylistViewScreen {
                           return VideoThumbnailView(
                               videoId: video.videoId,
                               decoration: const BoxDecoration(),
-                              thumbnailUrl: video.deArrowThumbnailUrl ??
-                                  ImageObject.getBestThumbnail(
-                                          video.videoThumbnails)
-                                      ?.url ??
-                                  '');
+                              thumbnails: video.thumbnails);
                         },
                         options: CarouselOptions(
                           autoPlayCurve: Curves.easeInOutQuad,
diff --git a/lib/settings/models/db/video_filter.g.dart b/lib/settings/models/db/video_filter.g.dart
index 2b9a99fc..78978655 100644
--- a/lib/settings/models/db/video_filter.g.dart
+++ b/lib/settings/models/db/video_filter.g.dart
@@ -34,16 +34,16 @@ abstract class _$VideoFilterCWProxy {
   /// VideoFilter(...).copyWith(id: 12, name: "My name")
   /// ````
   VideoFilter call({
-    String? uuid,
+    String uuid,
     String? channelId,
     FilterOperation? operation,
     FilterType? type,
     String? value,
-    bool? filterAll,
-    bool? hideFromFeed,
-    List<int>? daysOfWeek,
-    String? startTime,
-    String? endTime,
+    bool filterAll,
+    bool hideFromFeed,
+    List<int> daysOfWeek,
+    String startTime,
+    String endTime,
   });
 }
 
@@ -106,7 +106,7 @@ class _$VideoFilterCWProxyImpl implements _$VideoFilterCWProxy {
     Object? endTime = const $CopyWithPlaceholder(),
   }) {
     return VideoFilter._(
-      uuid == const $CopyWithPlaceholder() || uuid == null
+      uuid == const $CopyWithPlaceholder()
           ? _value.uuid
           // ignore: cast_nullable_to_non_nullable
           : uuid as String,
@@ -126,23 +126,23 @@ class _$VideoFilterCWProxyImpl implements _$VideoFilterCWProxy {
           ? _value.value
           // ignore: cast_nullable_to_non_nullable
           : value as String?,
-      filterAll == const $CopyWithPlaceholder() || filterAll == null
+      filterAll == const $CopyWithPlaceholder()
           ? _value.filterAll
           // ignore: cast_nullable_to_non_nullable
           : filterAll as bool,
-      hideFromFeed == const $CopyWithPlaceholder() || hideFromFeed == null
+      hideFromFeed == const $CopyWithPlaceholder()
           ? _value.hideFromFeed
           // ignore: cast_nullable_to_non_nullable
           : hideFromFeed as bool,
-      daysOfWeek == const $CopyWithPlaceholder() || daysOfWeek == null
+      daysOfWeek == const $CopyWithPlaceholder()
           ? _value.daysOfWeek
           // ignore: cast_nullable_to_non_nullable
           : daysOfWeek as List<int>,
-      startTime == const $CopyWithPlaceholder() || startTime == null
+      startTime == const $CopyWithPlaceholder()
           ? _value.startTime
           // ignore: cast_nullable_to_non_nullable
           : startTime as String,
-      endTime == const $CopyWithPlaceholder() || endTime == null
+      endTime == const $CopyWithPlaceholder()
           ? _value.endTime
           // ignore: cast_nullable_to_non_nullable
           : endTime as String,
diff --git a/lib/settings/views/components/video_filter_channel.dart b/lib/settings/views/components/video_filter_channel.dart
index 1918259e..b216ab68 100644
--- a/lib/settings/views/components/video_filter_channel.dart
+++ b/lib/settings/views/components/video_filter_channel.dart
@@ -1,15 +1,15 @@
 import 'package:auto_route/auto_route.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:flutter_swipe_action_cell/core/cell.dart';
 import 'package:clipious/router.dart';
 import 'package:clipious/settings/states/video_filter.dart';
 import 'package:clipious/settings/states/video_filter_channel.dart';
 import 'package:clipious/settings/views/components/video_filter_item.dart';
+import 'package:clipious/utils/views/components/thumbnail.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:flutter_swipe_action_cell/core/cell.dart';
 
 import '../../../utils/models/image_object.dart';
-import '../../../videos/views/components/video_thumbnail.dart';
 import '../../models/db/video_filter.dart';
 
 class VideoFilterChannel extends StatelessWidget {
@@ -68,10 +68,9 @@ class VideoFilterChannel extends StatelessWidget {
                           child: Padding(
                             padding: const EdgeInsets.only(right: 8.0),
                             child: Thumbnail(
-                              thumbnailUrl: ImageObject.getBestThumbnail(
-                                          state.channel?.authorThumbnails)
-                                      ?.url ??
-                                  '',
+                              thumbnails:
+                                  ImageObject.getThumbnailUrlsByPreferredOrder(
+                                      state.channel?.authorThumbnails),
                               width: 20,
                               height: 20,
                               decoration: BoxDecoration(
diff --git a/lib/utils/models/image_object.dart b/lib/utils/models/image_object.dart
index b442d007..c7459e91 100644
--- a/lib/utils/models/image_object.dart
+++ b/lib/utils/models/image_object.dart
@@ -16,7 +16,13 @@ class ImageObject {
 
   Map<String, dynamic> toJson() => _$ImageObjectToJson(this);
 
-  static ImageObject? getBestThumbnail(List<ImageObject>? images) {
+  static List<String> getThumbnailUrlsByPreferredOrder(
+      List<ImageObject>? images) {
+    return _getThumbnailsByPreferredORder(images).map((i) => i.url).toList();
+  }
+
+  static List<ImageObject> _getThumbnailsByPreferredORder(
+      List<ImageObject>? images) {
     if (images != null && images.isNotEmpty) {
       List<ImageObject> imgs = List.from(images);
       imgs.sort((a, b) {
@@ -29,7 +35,15 @@ class ImageObject {
           return (aHasDefault ? 0 : 1).compareTo(bHasDefault ? 0 : 1);
         }
       });
+      return imgs;
+    } else {
+      return [];
+    }
+  }
 
+  static ImageObject? getBestThumbnail(List<ImageObject>? images) {
+    final imgs = _getThumbnailsByPreferredORder(images);
+    if (imgs.isNotEmpty) {
       return imgs.firstOrNull;
     } else {
       return null;
diff --git a/lib/utils/states/thumbnail.dart b/lib/utils/states/thumbnail.dart
new file mode 100644
index 00000000..0ae51037
--- /dev/null
+++ b/lib/utils/states/thumbnail.dart
@@ -0,0 +1,40 @@
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:logging/logging.dart';
+
+part 'thumbnail.freezed.dart';
+
+final _log = Logger('ThumbnailCubit');
+
+class ThumbnailCubit extends Cubit<ThumbnailState> {
+  ThumbnailCubit(super.initialState) {
+    init();
+  }
+
+  init() {
+    if (state.urls.isNotEmpty) {
+      emit(state.copyWith(selected: state.urls.first));
+    }
+  }
+
+  onThumbnailFailed() {
+    _log.info('Failed to load thumbnail, trying another one');
+    if (state.urls.isNotEmpty) {
+      List<String> thumbnails = List.from(state.urls);
+      thumbnails.removeAt(0);
+      if (thumbnails.isNotEmpty) {
+        emit(state.copyWith(urls: thumbnails, selected: thumbnails[0]));
+      } else {
+        emit(state.copyWith(urls: thumbnails, selected: null));
+      }
+    } else {
+      emit(state.copyWith(selected: null));
+    }
+  }
+}
+
+@freezed
+class ThumbnailState with _$ThumbnailState {
+  const factory ThumbnailState(
+      {@Default([]) List<String> urls, String? selected}) = _ThumbnailState;
+}
diff --git a/lib/utils/states/thumbnail.freezed.dart b/lib/utils/states/thumbnail.freezed.dart
new file mode 100644
index 00000000..b95d01af
--- /dev/null
+++ b/lib/utils/states/thumbnail.freezed.dart
@@ -0,0 +1,172 @@
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'thumbnail.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+T _$identity<T>(T value) => value;
+
+final _privateConstructorUsedError = UnsupportedError(
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
+
+/// @nodoc
+mixin _$ThumbnailState {
+  List<String> get urls => throw _privateConstructorUsedError;
+  String? get selected => throw _privateConstructorUsedError;
+
+  /// Create a copy of ThumbnailState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  $ThumbnailStateCopyWith<ThumbnailState> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $ThumbnailStateCopyWith<$Res> {
+  factory $ThumbnailStateCopyWith(
+          ThumbnailState value, $Res Function(ThumbnailState) then) =
+      _$ThumbnailStateCopyWithImpl<$Res, ThumbnailState>;
+  @useResult
+  $Res call({List<String> urls, String? selected});
+}
+
+/// @nodoc
+class _$ThumbnailStateCopyWithImpl<$Res, $Val extends ThumbnailState>
+    implements $ThumbnailStateCopyWith<$Res> {
+  _$ThumbnailStateCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  /// Create a copy of ThumbnailState
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? urls = null,
+    Object? selected = freezed,
+  }) {
+    return _then(_value.copyWith(
+      urls: null == urls
+          ? _value.urls
+          : urls // ignore: cast_nullable_to_non_nullable
+              as List<String>,
+      selected: freezed == selected
+          ? _value.selected
+          : selected // ignore: cast_nullable_to_non_nullable
+              as String?,
+    ) as $Val);
+  }
+}
+
+/// @nodoc
+abstract class _$$ThumbnailStateImplCopyWith<$Res>
+    implements $ThumbnailStateCopyWith<$Res> {
+  factory _$$ThumbnailStateImplCopyWith(_$ThumbnailStateImpl value,
+          $Res Function(_$ThumbnailStateImpl) then) =
+      __$$ThumbnailStateImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call({List<String> urls, String? selected});
+}
+
+/// @nodoc
+class __$$ThumbnailStateImplCopyWithImpl<$Res>
+    extends _$ThumbnailStateCopyWithImpl<$Res, _$ThumbnailStateImpl>
+    implements _$$ThumbnailStateImplCopyWith<$Res> {
+  __$$ThumbnailStateImplCopyWithImpl(
+      _$ThumbnailStateImpl _value, $Res Function(_$ThumbnailStateImpl) _then)
+      : super(_value, _then);
+
+  /// Create a copy of ThumbnailState
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? urls = null,
+    Object? selected = freezed,
+  }) {
+    return _then(_$ThumbnailStateImpl(
+      urls: null == urls
+          ? _value._urls
+          : urls // ignore: cast_nullable_to_non_nullable
+              as List<String>,
+      selected: freezed == selected
+          ? _value.selected
+          : selected // ignore: cast_nullable_to_non_nullable
+              as String?,
+    ));
+  }
+}
+
+/// @nodoc
+
+class _$ThumbnailStateImpl implements _ThumbnailState {
+  const _$ThumbnailStateImpl(
+      {final List<String> urls = const [], this.selected})
+      : _urls = urls;
+
+  final List<String> _urls;
+  @override
+  @JsonKey()
+  List<String> get urls {
+    if (_urls is EqualUnmodifiableListView) return _urls;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_urls);
+  }
+
+  @override
+  final String? selected;
+
+  @override
+  String toString() {
+    return 'ThumbnailState(urls: $urls, selected: $selected)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$ThumbnailStateImpl &&
+            const DeepCollectionEquality().equals(other._urls, _urls) &&
+            (identical(other.selected, selected) ||
+                other.selected == selected));
+  }
+
+  @override
+  int get hashCode => Object.hash(
+      runtimeType, const DeepCollectionEquality().hash(_urls), selected);
+
+  /// Create a copy of ThumbnailState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$ThumbnailStateImplCopyWith<_$ThumbnailStateImpl> get copyWith =>
+      __$$ThumbnailStateImplCopyWithImpl<_$ThumbnailStateImpl>(
+          this, _$identity);
+}
+
+abstract class _ThumbnailState implements ThumbnailState {
+  const factory _ThumbnailState(
+      {final List<String> urls, final String? selected}) = _$ThumbnailStateImpl;
+
+  @override
+  List<String> get urls;
+  @override
+  String? get selected;
+
+  /// Create a copy of ThumbnailState
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$ThumbnailStateImplCopyWith<_$ThumbnailStateImpl> get copyWith =>
+      throw _privateConstructorUsedError;
+}
diff --git a/lib/utils/views/components/thumbnail.dart b/lib/utils/views/components/thumbnail.dart
new file mode 100644
index 00000000..d4178619
--- /dev/null
+++ b/lib/utils/views/components/thumbnail.dart
@@ -0,0 +1,125 @@
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:clipious/globals.dart';
+import 'package:clipious/settings/models/db/server.dart';
+import 'package:clipious/utils/states/thumbnail.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+class Thumbnail extends StatelessWidget {
+  final Widget? child;
+  final double? height;
+  final double? width;
+
+  final List<String>? thumbnails;
+  final BoxDecoration decoration;
+
+  const Thumbnail(
+      {super.key,
+      this.child,
+      this.thumbnails,
+      required this.decoration,
+      this.width,
+      this.height});
+
+  @override
+  Widget build(BuildContext context) {
+    ColorScheme colors = Theme.of(context).colorScheme;
+    return FutureBuilder<Server?>(
+        future: db.getCurrentlySelectedServer(),
+        builder: (context, server) {
+          return !server.hasData || server.data == null
+              ? Container(
+                  decoration: decoration,
+                  width: width,
+                  height: height,
+                  child: child)
+              : BlocProvider(
+                  create: (context) =>
+                      ThumbnailCubit(ThumbnailState(urls: thumbnails ?? [])),
+                  child: BlocBuilder<ThumbnailCubit, ThumbnailState>(
+                      builder: (context, state) {
+                    if (state.selected == null) {
+                      return _ErrorWidget(
+                          decoration: decoration, width: width, height: height);
+                    } else {
+                      final cubit = context.read<ThumbnailCubit>();
+
+                      final url = state.selected!.startsWith('/')
+                          ? server.data!.url + state.selected!
+                          : state.selected!;
+
+                      return CachedNetworkImage(
+                        key: ValueKey(url),
+                        cacheKey: url,
+                        httpHeaders: server.data?.customHeaders,
+                        errorListener: (value) => cubit.onThumbnailFailed(),
+                        imageBuilder: (context, imageProvider) =>
+                            AnimatedContainer(
+                          height: height,
+                          width: width,
+                          decoration: decoration.copyWith(
+                              image: DecorationImage(
+                                  image: imageProvider, fit: BoxFit.cover)),
+                          // duration: animationDuration,
+                          duration: animationDuration ~/ 2,
+                          curve: Curves.easeInOutQuad,
+                          child: child,
+                        ),
+                        imageUrl: url,
+                        placeholderFadeInDuration: animationDuration,
+                        fadeInDuration: animationDuration,
+                        fadeOutDuration: animationDuration,
+                        errorWidget: (context, url, error) => _ErrorWidget(
+                          decoration: decoration,
+                          width: width,
+                          height: height,
+                        ),
+                        progressIndicatorBuilder: (context, url, progress) =>
+                            Container(
+                          height: height,
+                          width: width,
+                          alignment: Alignment.center,
+                          decoration: decoration.copyWith(
+                              color: colors.secondaryContainer),
+                          // duration: animationDuration,
+                          child: const SizedBox(
+                              height: 20,
+                              width: 20,
+                              child: CircularProgressIndicator(
+                                strokeWidth: 1,
+                              )),
+                        ),
+                      );
+                    }
+                  }),
+                );
+        });
+  }
+}
+
+class _ErrorWidget extends StatelessWidget {
+  final double? height;
+  final double? width;
+  final BoxDecoration decoration;
+
+  const _ErrorWidget({this.height, this.width, required this.decoration});
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = Theme.of(context).colorScheme;
+    return Container(
+      height: height,
+      width: width,
+      alignment: Alignment.center,
+      decoration: decoration.copyWith(color: colors.secondaryContainer),
+      // duration: animationDuration,
+      child: SizedBox(
+          height: 20,
+          width: 20,
+          child: Icon(
+            Icons.error_outline,
+            color: colors.onSecondaryContainer.withOpacity(0.5),
+          )),
+    );
+  }
+}
diff --git a/lib/videos/models/video.dart b/lib/videos/models/video.dart
index eee8cf89..2cd80943 100644
--- a/lib/videos/models/video.dart
+++ b/lib/videos/models/video.dart
@@ -102,6 +102,12 @@ class Video with _$Video implements ShareLinks, IdedVideo {
 
     return link;
   }
+
+  List<String> get thumbnails {
+    return deArrowThumbnailUrl != null
+        ? [deArrowThumbnailUrl!]
+        : ImageObject.getThumbnailUrlsByPreferredOrder(videoThumbnails);
+  }
 }
 
 /*
diff --git a/lib/videos/views/components/compact_video.dart b/lib/videos/views/components/compact_video.dart
index cad7a26c..9797bfa9 100644
--- a/lib/videos/views/components/compact_video.dart
+++ b/lib/videos/views/components/compact_video.dart
@@ -94,12 +94,12 @@ class CompactVideo extends StatelessWidget {
                               : video != null
                                   ? VideoThumbnailView(
                                       videoId: videoId,
-                                      thumbnailUrl:
-                                          video?.deArrowThumbnailUrl ??
-                                              ImageObject.getWorstThumbnail(
-                                                      video?.videoThumbnails)
-                                                  ?.url ??
-                                              '')
+                                      thumbnails: video?.deArrowThumbnailUrl !=
+                                              null
+                                          ? [video!.deArrowThumbnailUrl!]
+                                          : ImageObject
+                                              .getThumbnailUrlsByPreferredOrder(
+                                                  video?.videoThumbnails))
                                   : offlineVideo != null
                                       ? OfflineVideoThumbnail(
                                           video: offlineVideo!,
diff --git a/lib/videos/views/components/info.dart b/lib/videos/views/components/info.dart
index d9a49650..84965e68 100644
--- a/lib/videos/views/components/info.dart
+++ b/lib/videos/views/components/info.dart
@@ -1,13 +1,13 @@
 import 'package:auto_route/auto_route.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:clipious/player/states/player.dart';
 import 'package:clipious/router.dart';
 import 'package:clipious/utils/views/components/text_linkified.dart';
+import 'package:clipious/utils/views/components/thumbnail.dart';
 import 'package:clipious/videos/models/video.dart';
 import 'package:clipious/videos/views/components/video_metrics.dart';
-import 'package:clipious/videos/views/components/video_thumbnail.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 import '../../../subscription_management/view/components/subscribe_button.dart';
 import '../../../utils/models/image_object.dart';
@@ -71,10 +71,8 @@ class VideoInfo extends StatelessWidget {
                   child: Padding(
                     padding: const EdgeInsets.symmetric(vertical: 4.0),
                     child: Thumbnail(
-                      thumbnailUrl:
-                          ImageObject.getBestThumbnail(video.authorThumbnails)
-                                  ?.url ??
-                              '',
+                      thumbnails: ImageObject.getThumbnailUrlsByPreferredOrder(
+                          video.authorThumbnails),
                       width: 40,
                       height: 40,
                       decoration: BoxDecoration(
diff --git a/lib/videos/views/components/inner_view.dart b/lib/videos/views/components/inner_view.dart
index f4720a03..49f6cc82 100644
--- a/lib/videos/views/components/inner_view.dart
+++ b/lib/videos/views/components/inner_view.dart
@@ -54,10 +54,10 @@ class VideoInnerView extends StatelessWidget {
                     : null,
                 child: VideoThumbnailView(
                   videoId: video.videoId,
-                  thumbnailUrl: video.deArrowThumbnailUrl ??
-                      ImageObject.getBestThumbnail(video.videoThumbnails)
-                          ?.url ??
-                      '',
+                  thumbnails: video.deArrowThumbnailUrl != null
+                      ? [video.deArrowThumbnailUrl!]
+                      : ImageObject.getThumbnailUrlsByPreferredOrder(
+                          video.videoThumbnails),
                   child: phoneLandscape
                       ? const SizedBox.shrink()
                       : Stack(
diff --git a/lib/videos/views/components/inner_view_tablet.dart b/lib/videos/views/components/inner_view_tablet.dart
index 08803773..a64222c4 100644
--- a/lib/videos/views/components/inner_view_tablet.dart
+++ b/lib/videos/views/components/inner_view_tablet.dart
@@ -56,10 +56,10 @@ class VideoTabletInnerView extends StatelessWidget {
                 width: double.infinity,
                 child: VideoThumbnailView(
                   videoId: video.videoId,
-                  thumbnailUrl: video.deArrowThumbnailUrl ??
-                      ImageObject.getBestThumbnail(video.videoThumbnails)
-                          ?.url ??
-                      '',
+                  thumbnails: video.deArrowThumbnailUrl != null
+                      ? [video.deArrowThumbnailUrl!]
+                      : ImageObject.getThumbnailUrlsByPreferredOrder(
+                          video.videoThumbnails),
                   child: Stack(
                     alignment: Alignment.center,
                     children: [
diff --git a/lib/videos/views/components/video_in_list.dart b/lib/videos/views/components/video_in_list.dart
index 47f08461..328dc7ff 100644
--- a/lib/videos/views/components/video_in_list.dart
+++ b/lib/videos/views/components/video_in_list.dart
@@ -144,11 +144,10 @@ class VideoListItem extends StatelessWidget {
                     : video != null
                         ? VideoThumbnailView(
                             videoId: video!.videoId,
-                            thumbnailUrl: video!.deArrowThumbnailUrl ??
-                                ImageObject.getBestThumbnail(
-                                        video!.videoThumbnails)
-                                    ?.url ??
-                                '',
+                            thumbnails: video!.deArrowThumbnailUrl != null
+                                ? [video!.deArrowThumbnailUrl!]
+                                : ImageObject.getThumbnailUrlsByPreferredOrder(
+                                    video!.videoThumbnails),
                             decoration: BoxDecoration(
                                 borderRadius:
                                     BorderRadius.circular(small ? 5 : 10)),
diff --git a/lib/videos/views/components/video_thumbnail.dart b/lib/videos/views/components/video_thumbnail.dart
index 676a4d27..68d20a13 100644
--- a/lib/videos/views/components/video_thumbnail.dart
+++ b/lib/videos/views/components/video_thumbnail.dart
@@ -1,18 +1,16 @@
-import 'package:cached_network_image/cached_network_image.dart';
+import 'package:clipious/utils/views/components/thumbnail.dart';
 import 'package:flutter/material.dart';
-import 'package:clipious/globals.dart';
-import 'package:clipious/settings/models/db/server.dart';
 
 class VideoThumbnailView extends StatelessWidget {
   final String videoId;
-  final String thumbnailUrl;
+  final List<String> thumbnails;
   final Widget? child;
   final BoxDecoration? decoration;
 
   const VideoThumbnailView(
       {super.key,
       required this.videoId,
-      required this.thumbnailUrl,
+      required this.thumbnails,
       this.child,
       this.decoration});
 
@@ -22,7 +20,7 @@ class VideoThumbnailView extends StatelessWidget {
     return AspectRatio(
       aspectRatio: 16 / 9,
       child: Thumbnail(
-          thumbnailUrl: thumbnailUrl,
+          thumbnails: thumbnails,
           decoration: decoration != null
               ? decoration!
               : BoxDecoration(
@@ -32,84 +30,3 @@ class VideoThumbnailView extends StatelessWidget {
     );
   }
 }
-
-class Thumbnail extends StatelessWidget {
-  final Widget? child;
-  final double? height;
-  final double? width;
-
-  final String thumbnailUrl;
-  final BoxDecoration decoration;
-
-  const Thumbnail(
-      {super.key,
-      this.child,
-      required this.thumbnailUrl,
-      required this.decoration,
-      this.width,
-      this.height});
-
-  @override
-  Widget build(BuildContext context) {
-    ColorScheme colors = Theme.of(context).colorScheme;
-    return FutureBuilder<Server?>(
-        future: db.getCurrentlySelectedServer(),
-        builder: (context, server) {
-          return !server.hasData || server.data == null
-              ? Container(
-                  decoration: decoration,
-                  width: width,
-                  height: height,
-                  child: child)
-              : CachedNetworkImage(
-                  cacheKey: thumbnailUrl,
-                  httpHeaders: server.data?.customHeaders,
-                  imageBuilder: (context, imageProvider) => AnimatedContainer(
-                    height: height,
-                    width: width,
-                    decoration: decoration.copyWith(
-                        image: DecorationImage(
-                            image: imageProvider, fit: BoxFit.cover)),
-                    // duration: animationDuration,
-                    duration: animationDuration ~/ 2,
-                    curve: Curves.easeInOutQuad,
-                    child: child,
-                  ),
-                  imageUrl: thumbnailUrl,
-                  placeholderFadeInDuration: animationDuration,
-                  fadeInDuration: animationDuration,
-                  fadeOutDuration: animationDuration,
-                  errorWidget: (context, url, error) => Container(
-                    height: height,
-                    width: width,
-                    alignment: Alignment.center,
-                    decoration:
-                        decoration.copyWith(color: colors.secondaryContainer),
-                    // duration: animationDuration,
-                    child: SizedBox(
-                        height: 20,
-                        width: 20,
-                        child: Icon(
-                          Icons.error_outline,
-                          color: colors.onSecondaryContainer.withOpacity(0.5),
-                        )),
-                  ),
-                  progressIndicatorBuilder: (context, url, progress) =>
-                      Container(
-                    height: height,
-                    width: width,
-                    alignment: Alignment.center,
-                    decoration:
-                        decoration.copyWith(color: colors.secondaryContainer),
-                    // duration: animationDuration,
-                    child: const SizedBox(
-                        height: 20,
-                        width: 20,
-                        child: CircularProgressIndicator(
-                          strokeWidth: 1,
-                        )),
-                  ),
-                );
-        });
-  }
-}
diff --git a/lib/videos/views/tv/components/video_item.dart b/lib/videos/views/tv/components/video_item.dart
index a9b0d31a..a24d48c6 100644
--- a/lib/videos/views/tv/components/video_item.dart
+++ b/lib/videos/views/tv/components/video_item.dart
@@ -1,16 +1,15 @@
 import 'package:auto_route/auto_route.dart';
+import 'package:clipious/router.dart';
+import 'package:clipious/utils.dart';
 import 'package:clipious/videos/models/video.dart';
+import 'package:clipious/videos/states/video_in_list.dart';
 import 'package:duration/duration.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:clipious/router.dart';
-import 'package:clipious/utils.dart';
-import 'package:clipious/videos/states/video_in_list.dart';
 
 import '../../../../globals.dart';
-import '../../../../utils/models/image_object.dart';
 import '../../components/video_thumbnail.dart';
 
 class TvVideoItem extends StatelessWidget {
@@ -127,12 +126,7 @@ class TvVideoItem extends StatelessWidget {
                                       )
                                     : VideoThumbnailView(
                                         videoId: video.videoId,
-                                        thumbnailUrl:
-                                            video.deArrowThumbnailUrl ??
-                                                ImageObject.getBestThumbnail(
-                                                        video.videoThumbnails)
-                                                    ?.url ??
-                                                '',
+                                        thumbnails: video.thumbnails,
                                         child: Padding(
                                           padding: const EdgeInsets.all(8.0),
                                           child: Container(
diff --git a/lib/videos/views/tv/screens/video.dart b/lib/videos/views/tv/screens/video.dart
index a3145ead..a8cd108e 100644
--- a/lib/videos/views/tv/screens/video.dart
+++ b/lib/videos/views/tv/screens/video.dart
@@ -1,6 +1,7 @@
 import 'dart:ui';
 
 import 'package:auto_route/auto_route.dart';
+import 'package:clipious/utils/views/components/thumbnail.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -98,12 +99,7 @@ class TvVideoScreen extends StatelessWidget {
                           : VideoThumbnailView(
                               videoId: videoState.video!.videoId,
                               decoration: const BoxDecoration(),
-                              thumbnailUrl:
-                                  videoState.video!.deArrowThumbnailUrl ??
-                                      ImageObject.getBestThumbnail(
-                                              videoState.video?.videoThumbnails)
-                                          ?.url ??
-                                      ''),
+                              thumbnails: videoState.video!.thumbnails),
                       AnimatedPositioned(
                         top: tvState.showImage ? 315 : 0,
                         left: 0,
@@ -247,11 +243,11 @@ class TvVideoScreen extends StatelessWidget {
                                                                     .min,
                                                             children: [
                                                               Thumbnail(
-                                                                thumbnailUrl: ImageObject.getBestThumbnail(videoState
+                                                                thumbnails: ImageObject
+                                                                    .getThumbnailUrlsByPreferredOrder(
+                                                                        videoState
                                                                             .video
-                                                                            ?.authorThumbnails)
-                                                                        ?.url ??
-                                                                    '',
+                                                                            ?.authorThumbnails),
                                                                 width: 40,
                                                                 height: 40,
                                                                 decoration: BoxDecoration(