diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/AnnouncementController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/AnnouncementController.kt
index 16f6970bd..568af8488 100644
--- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/AnnouncementController.kt
+++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/AnnouncementController.kt
@@ -36,7 +36,7 @@ class AnnouncementController(
     Caffeine
       .newBuilder()
       .expireAfterAccess(1, TimeUnit.DAYS)
-      .build<String, JsonFeedDto>()
+      .build<String, JsonFeedDto?>()
 
   @GetMapping
   @PreAuthorize("hasRole('ADMIN')")
diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ReleaseController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ReleaseController.kt
index 8d3d1bd26..966454317 100644
--- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ReleaseController.kt
+++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ReleaseController.kt
@@ -58,7 +58,7 @@ class ReleaseController(
       }
       ?: throw ResponseStatusException(HttpStatus.NOT_FOUND)
 
-  fun fetchGitHubReleases(): List<GithubReleaseDto>? {
+  fun fetchGitHubReleases(): List<GithubReleaseDto> {
     val response =
       webClient
         .get()
@@ -67,6 +67,6 @@ class ReleaseController(
         }.retrieve()
         .toEntity(object : ParameterizedTypeReference<List<GithubReleaseDto>>() {})
         .block()
-    return response?.body
+    return response?.body ?: emptyList()
   }
 }