diff --git a/app/src/main/java/com/github/damontecres/wholphin/services/AppUpgradeHandler.kt b/app/src/main/java/com/github/damontecres/wholphin/services/AppUpgradeHandler.kt
index 23d6cef6..0331f04b 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/services/AppUpgradeHandler.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/services/AppUpgradeHandler.kt
@@ -250,7 +250,7 @@ suspend fun upgradeApp(
         }
     }
 
-    if (previous.isEqualOrBefore(Version.fromString("0.5.0-6-g0"))) {
+    if (previous.isEqualOrBefore(Version.fromString("0.5.3-0-g0"))) {
         appPreferences.updateData {
             it.updateScreensaverPreferences {
                 startDelay = ScreensaverPreference.DEFAULT_START_DELAY
diff --git a/app/src/main/java/com/github/damontecres/wholphin/services/ScreensaverService.kt b/app/src/main/java/com/github/damontecres/wholphin/services/ScreensaverService.kt
index 5d73ec21..c81893b3 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/services/ScreensaverService.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/services/ScreensaverService.kt
@@ -161,27 +161,32 @@ class ScreensaverService
                 if (pager.isEmpty()) {
                     emit(null)
                 } else {
+                    val duration =
+                        userPreferencesService
+                            .getCurrent()
+                            .appPreferences
+                            .interfacePreferences.screensaverPreference.duration.milliseconds
                     while (true) {
-                        val item = pager.getBlocking(index)
-                        Timber.v("Next index=%s, item=%s", index, item?.id)
-                        if (item != null) {
-                            val backdropUrl =
-                                if (item.type == BaseItemKind.PHOTO) {
-                                    api.libraryApi.getDownloadUrl(item.id)
-                                } else {
-                                    imageUrlService.getItemImageUrl(item, ImageType.BACKDROP)
-                                }
-                            val title =
-                                if (item.type == BaseItemKind.PHOTO) {
-                                    item.data.premiereDate?.let {
-                                        formatDate(it.toLocalDate())
+                        try {
+                            val item = pager.getBlocking(index)
+                            Timber.v("Next index=%s, item=%s", index, item?.id)
+                            if (item != null) {
+                                val backdropUrl =
+                                    if (item.type == BaseItemKind.PHOTO) {
+                                        api.libraryApi.getDownloadUrl(item.id)
+                                    } else {
+                                        imageUrlService.getItemImageUrl(item, ImageType.BACKDROP)
                                     }
-                                } else {
-                                    item.title
-                                }
-                            val logoUrl = imageUrlService.getItemImageUrl(item, ImageType.LOGO)
-                            if (backdropUrl != null) {
-                                try {
+                                val title =
+                                    if (item.type == BaseItemKind.PHOTO) {
+                                        item.data.premiereDate?.let {
+                                            formatDate(it.toLocalDate())
+                                        }
+                                    } else {
+                                        item.title
+                                    }
+                                val logoUrl = imageUrlService.getItemImageUrl(item, ImageType.LOGO)
+                                if (backdropUrl != null) {
                                     context.imageLoader
                                         .enqueue(
                                             ImageRequest
@@ -191,18 +196,17 @@ class ScreensaverService
                                         ).job
                                         .await()
                                     emit(CurrentItem(item, backdropUrl, logoUrl, title ?: ""))
-                                } catch (_: CancellationException) {
-                                    break
+                                    delay(duration)
                                 }
-                                val duration =
-                                    userPreferencesService
-                                        .getCurrent()
-                                        .appPreferences
-                                        .interfacePreferences.screensaverPreference.duration.milliseconds
-                                delay(duration)
                             }
+                        } catch (_: CancellationException) {
+                            break
+                        } catch (ex: Exception) {
+                            Timber.e(ex, "Error fetching next item")
+                            delay(duration)
                         }
                         index++
+                        if (index > pager.lastIndex) index = 0
                     }
                 }
             }.flowOn(Dispatchers.Default).cancellable()