diff --git a/app/backend/src/main/kotlin/nito/club/backend/schema/BookQueryService.kt b/app/backend/src/main/kotlin/nito/club/backend/schema/BookQueryService.kt
index 488605db..6d813868 100644
--- a/app/backend/src/main/kotlin/nito/club/backend/schema/BookQueryService.kt
+++ b/app/backend/src/main/kotlin/nito/club/backend/schema/BookQueryService.kt
@@ -10,9 +10,9 @@ import java.util.concurrent.CompletableFuture
 class BookQueryService : Query {
     @GraphQLDescription("Return list of books based on BookSearchParameter options")
     @Suppress("unused")
-    fun searchBooks(params: BookSearchParameters, dfe: DataFetchingEnvironment): CompletableFuture<List<Book>> =
+    fun searchBooks(params: BookSearchParameters, dfe: DataFetchingEnvironment): CompletableFuture<List<Book>>? =
         dfe.getDataLoader<Int, Book>(BookDataLoader.dataLoaderName)
-            .loadMany(params.ids)
+            ?.loadMany(params.ids)
 }
 
 data class BookSearchParameters(val ids: List<Int>)
diff --git a/app/backend/src/main/kotlin/nito/club/backend/schema/CourseQueryService.kt b/app/backend/src/main/kotlin/nito/club/backend/schema/CourseQueryService.kt
index c9c0edcc..dbc73eae 100644
--- a/app/backend/src/main/kotlin/nito/club/backend/schema/CourseQueryService.kt
+++ b/app/backend/src/main/kotlin/nito/club/backend/schema/CourseQueryService.kt
@@ -7,9 +7,9 @@ import nito.club.backend.schema.models.Course
 import java.util.concurrent.CompletableFuture
 
 class CourseQueryService : Query {
-    fun searchCourses(params: CourseSearchParameters, dfe: DataFetchingEnvironment): CompletableFuture<List<Course>> =
+    fun searchCourses(params: CourseSearchParameters, dfe: DataFetchingEnvironment): CompletableFuture<List<Course>>? =
         dfe.getDataLoader<Int, Course>(CourseDataLoader.dataLoaderName)
-            .loadMany(params.ids)
+            ?.loadMany(params.ids)
 }
 
 data class CourseSearchParameters(val ids: List<Int>)
diff --git a/app/backend/src/main/kotlin/nito/club/backend/schema/UniversityQueryService.kt b/app/backend/src/main/kotlin/nito/club/backend/schema/UniversityQueryService.kt
index 3bbbfd0e..133629ad 100644
--- a/app/backend/src/main/kotlin/nito/club/backend/schema/UniversityQueryService.kt
+++ b/app/backend/src/main/kotlin/nito/club/backend/schema/UniversityQueryService.kt
@@ -10,9 +10,9 @@ class UniversityQueryService : Query {
     fun searchUniversities(
         params: UniversitySearchParameters,
         dfe: DataFetchingEnvironment,
-    ): CompletableFuture<List<University>> =
+    ): CompletableFuture<List<University>>? =
         dfe.getDataLoader<Int, University>(UniversityDataLoader.dataLoaderName)
-            .loadMany(params.ids)
+            ?.loadMany(params.ids)
 }
 
 data class UniversitySearchParameters(val ids: List<Int>)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0bde8b95..976d5eef 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -30,7 +30,7 @@ supabase = "2.6.1"
 sqldelight = "2.0.2"
 stately = "2.1.0"
 logback = "1.5.8"
-graphqlKotlin = "7.1.5"
+graphqlKotlin = "8.0.0"
 kotest = "5.9.1"
 precompose = "1.6.2"
 coil = "3.0.0-alpha10"