diff --git a/module/fid_bbi/src/fid_bbi/Db/Table/Tags.php b/module/fid_bbi/src/fid_bbi/Db/Table/Tags.php
index 04199f1d938c699f45737180f984b9bee32afc35..6a12ea3021244c6626e3ad727d1bfafe993c2cff 100644
--- a/module/fid_bbi/src/fid_bbi/Db/Table/Tags.php
+++ b/module/fid_bbi/src/fid_bbi/Db/Table/Tags.php
@@ -85,8 +85,10 @@ class Tags extends BaseTags
             );
             $select->group(['tag'])->order([new Expression('lower(tag)')]);
 
-            $select->where->equalTo('ur.user_id', $userId)
-                ->equalTo('rt.user_id', $userId);
+            // contrary to the VuFind core approach we want all
+            // TAGS of RECORDS from the list
+            // not only those tagged within the list
+            $select->where->equalTo('ur.user_id', $userId);
 
             if (null !== $source) {
                 $select->where->equalTo('r.source', $source);
@@ -96,7 +98,8 @@ class Tags extends BaseTags
                 $select->where->equalTo('r.record_id', $resourceId);
             }
             if (null !== $listId) {
-                $select->where->equalTo('rt.list_id', $listId);
+                // same as above: all TAGS of RECORDS from the list
+                $select->where->equalTo('ur.list_id', $listId);
             }
         };
         return $this->select($callback);
diff --git a/themes/fid_bbi/templates/RecordDriver/DefaultRecord/list-entry.phtml b/themes/fid_bbi/templates/RecordDriver/DefaultRecord/list-entry.phtml
index 44822387e0c7c554146fd7db55efbd84407bd998..efd3d618374595e5b41040bc82f1d93ff3bfb22e 100644
--- a/themes/fid_bbi/templates/RecordDriver/DefaultRecord/list-entry.phtml
+++ b/themes/fid_bbi/templates/RecordDriver/DefaultRecord/list-entry.phtml
@@ -93,9 +93,9 @@ if ($cover):
             }
           } ?>
 
-          <?php /*fid_bbi #16050*/
+          <?php /*fid_bbi #16050 and #16788*/
               $listTags = ($this->usertags()->getMode() !== 'disabled') ? $this->driver->getTags(
-                $list_id, $user_id, 'tag',$user_id
+                null, $user_id, 'tag',$user_id
               ) : array();
           ?>