diff --git a/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/DefaultSearchContentsRepository.kt b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/DefaultSearchContentsRepository.kt
index 48036df97..1cf24d218 100644
--- a/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/DefaultSearchContentsRepository.kt
+++ b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/DefaultSearchContentsRepository.kt
@@ -54,10 +54,10 @@ class DefaultSearchContentsRepository @Inject constructor(
         val newsResourceIds = newsResourceFtsDao.searchAllNewsResources("*$searchQuery*")
         val topicIds = topicFtsDao.searchAllTopics("*$searchQuery*")
 
-        return combine(newsResourceIds, topicIds) { news, topics ->
+        return combine(newsResourceIds, topicIds) { newsFlow, topicsFlow ->
             combine(
-                newsResourceDao.getNewsResources(filterNewsIds = news.toSet()),
-                topicDao.getTopicEntities(topics.toSet()),
+                newsResourceDao.getNewsResources(filterNewsIds = newsFlow.toSet()),
+                topicDao.getTopicEntities(topicsFlow.toSet()),
             ) { newsResources, topics ->
                 SearchResult(
                     topics = topics.map { it.asExternalModel() },
diff --git a/core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDao.kt b/core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDao.kt
index 0b1091d6d..cc8bba0e6 100644
--- a/core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDao.kt
+++ b/core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDao.kt
@@ -68,7 +68,7 @@ interface NewsResourceDao {
 
     @Transaction
     @Query(value = "SELECT * FROM news_resources ORDER BY publish_date DESC")
-    fun getOneOffNewsResources(): List<PopulatedNewsResource>
+    suspend fun getOneOffNewsResources(): List<PopulatedNewsResource>
 
     /**
      * Inserts [entities] into the db if they don't exist, and ignores those that do
diff --git a/core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/TopicDao.kt b/core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/TopicDao.kt
index 2676f6b67..693a85b77 100644
--- a/core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/TopicDao.kt
+++ b/core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/TopicDao.kt
@@ -42,7 +42,7 @@ interface TopicDao {
     fun getTopicEntities(): Flow<List<TopicEntity>>
 
     @Query(value = "SELECT * FROM topics")
-    fun getOneOffTopicEntities(): List<TopicEntity>
+    suspend fun getOneOffTopicEntities(): List<TopicEntity>
 
     @Query(
         value = """