diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt
index ecbea43ef55..fbe35cd73ba 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt
@@ -498,8 +498,8 @@ class MessageListFragment :
             val folderId = currentFolder.databaseId
             messagingController.loadMoreMessages(account, folderId)
         } else if (isRemoteSearch) {
-            val additionalSearchResults = extraSearchResults ?: return
-            if (additionalSearchResults.isEmpty()) return
+            val additionalSearchResults = extraSearchResults
+            if (additionalSearchResults.isNullOrEmpty()) return
 
             val loadSearchResults: List<String>