diff --git a/module/VuFind/src/VuFind/Search/Favorites/Results.php b/module/VuFind/src/VuFind/Search/Favorites/Results.php
index 62b8537c28cb28ec70d0153fb7c901d97a851bf5..95a4fb009a035565920b93152061c49cf29ee464 100644
--- a/module/VuFind/src/VuFind/Search/Favorites/Results.php
+++ b/module/VuFind/src/VuFind/Search/Favorites/Results.php
@@ -146,10 +146,10 @@ class Results extends BaseResults
 
         // How many results were there?
         $resource = new ResourceTable();
+        $userId = is_null($list) ? $this->user->id : $list->user_id;
+        $listId = is_null($list) ? null : $list->id;
         $rawResults = $resource->getFavorites(
-            is_null($list) ? $this->user->id : $list->user_id,
-            isset($list->id) ? $list->id : null,
-            $this->getTagFilters(), $this->getSort()
+            $userId, $listId, $this->getTagFilters(), $this->getSort()
         );
         $this->resultTotal = count($rawResults);
 
@@ -157,9 +157,7 @@ class Results extends BaseResults
         $limit = $this->getLimit();
         if ($this->resultTotal > $limit) {
             $rawResults = $resource->getFavorites(
-                is_null($list) ? $this->user->id : $list->user_id,
-                isset($list->id) ? $list->id : null,
-                $this->getTagFilters(), $this->getSort(),
+                $userId, $listId, $this->getTagFilters(), $this->getSort(),
                 $this->getStartRecord() - 1, $limit
             );
         }