diff --git a/client/scss/_asset-preview.scss b/client/scss/_asset-preview.scss
index a9d0cb48..b1f54d61 100644
--- a/client/scss/_asset-preview.scss
+++ b/client/scss/_asset-preview.scss
@@ -32,7 +32,6 @@
 }
 
 .asset-preview__label {
-  height: 100%;
   padding: $thin-padding;
   display: flex;
   flex-direction: column;
diff --git a/package-lock.json b/package-lock.json
index 8e4dd134..f8e404b2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7688,9 +7688,9 @@
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
     "js-yaml": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
-      "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
+      "version": "3.13.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz",
+      "integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==",
       "requires": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
diff --git a/server/controllers/api/file/availability/index.js b/server/controllers/api/file/availability/index.js
index d55ed230..04c4c7d2 100644
--- a/server/controllers/api/file/availability/index.js
+++ b/server/controllers/api/file/availability/index.js
@@ -1,5 +1,9 @@
+const logger = require('winston');
+
 const { handleErrorResponse } = require('../../../utils/errorHandlers.js');
-const db = require('../../../../models');
+const { getFileListFileByOutpoint } = require('server/lbrynet');
+
+const chainquery = require('chainquery').default;
 
 /*
 
@@ -10,18 +14,24 @@ const db = require('../../../../models');
 const fileAvailability = ({ ip, originalUrl, params }, res) => {
   const name = params.name;
   const claimId = params.claimId;
-  db.File
-    .findOne({
-      where: {
-        name,
-        claimId,
-      },
+  logger.debug(`fileAvailability params: name:${name} claimId:${claimId}`);
+  // TODO: we probably eventually want to check the publishCache for the claimId too,
+  //  and shop the outpoint to file_list.
+  return chainquery.claim.queries
+    .resolveClaim(name, claimId)
+    .then(result => {
+      return `${result.dataValues.transaction_hash_id}:${result.dataValues.vout}`;
+    })
+    .then(outpoint => {
+      logger.debug(`fileAvailability: outpoint: ${outpoint}`);
+      return getFileListFileByOutpoint(outpoint);
     })
     .then(result => {
-      if (result) {
-        return res.status(200).json({success: true, data: true});
+      if (result && result[0]) {
+        return res.status(200).json({ success: true, data: true });
+      } else {
+        res.status(200).json({ success: true, data: false });
       }
-      res.status(200).json({success: true, data: false});
     })
     .catch(error => {
       handleErrorResponse(originalUrl, ip, error, res);