diff --git a/server/controllers/api/claim/get/index.js b/server/controllers/api/claim/get/index.js
index 89a9523c..eadea694 100644
--- a/server/controllers/api/claim/get/index.js
+++ b/server/controllers/api/claim/get/index.js
@@ -1,11 +1,9 @@
-const { getClaim } = require('../../../../lbrynet');
-const {
-  createFileRecordDataAfterGet,
-} = require('../../../../models/utils/createFileRecordData.js');
+const { getClaim } = require('server/lbrynet');
+const { createFileRecordDataAfterGet } = require('server/models/utils/createFileRecordData.js');
 const { handleErrorResponse } = require('../../../utils/errorHandlers.js');
 const getClaimData = require('server/utils/getClaimData');
 const chainquery = require('chainquery').default;
-const db = require('../../../../models');
+const db = require('server/models');
 const logger = require('winston');
 const awaitFileSize = require('server/utils/awaitFileSize');
 
@@ -38,7 +36,7 @@ const claimGet = async ({ ip, originalUrl, params }, res) => {
     if (!claimData) {
       throw new Error('claim/get: getClaimData failed to get file blobs');
     }
-    let fileReady = await awaitFileSize(lbrynetResult.download_path, 2000000, 10000, 250);
+    const fileReady = await awaitFileSize(lbrynetResult.outpoint, 2000000, 10000, 250);
 
     if (fileReady !== 'ready') {
       throw new Error('claim/get: failed to get file after 10 seconds');
diff --git a/server/controllers/api/claim/update/index.js b/server/controllers/api/claim/update/index.js
index f2c47594..bca37d6d 100644
--- a/server/controllers/api/claim/update/index.js
+++ b/server/controllers/api/claim/update/index.js
@@ -23,7 +23,7 @@ const updateMetadata = ({ nsfw, license, licenseUrl, title, description }) => {
   const update = {};
   if (nsfw) update['nsfw'] = nsfw;
   if (license) update['license'] = license;
-  if (licenseUrl) update['licenseUrl'] = licenseUrl;
+  if (licenseUrl) update['license_url'] = licenseUrl;
   if (title) update['title'] = title;
   if (description) update['description'] = description;
   return update;
@@ -81,15 +81,7 @@ const claimUpdate = ({ body, files, headers, ip, originalUrl, user, tor }, res)
   gaStartTime = Date.now();
 
   try {
-    ({
-      name,
-      nsfw,
-      license,
-      licenseUrl,
-      title,
-      description,
-      thumbnail,
-    } = parsePublishApiRequestBody(body));
+    ({ name, nsfw, license, title, description, thumbnail } = parsePublishApiRequestBody(body));
     ({
       fileName,
       filePath,
diff --git a/server/lbrynet/index.js b/server/lbrynet/index.js
index 52633e07..6259dd0f 100644
--- a/server/lbrynet/index.js
+++ b/server/lbrynet/index.js
@@ -53,6 +53,26 @@ module.exports = {
         });
     });
   },
+  getFileListFileByOutpoint(outpoint) {
+    logger.debug(`lbryApi >> Getting File_List for "${outpoint}"`);
+    const gaStartTime = Date.now();
+    return new Promise((resolve, reject) => {
+      axios
+        .post(lbrynetUri, {
+          method: 'file_list',
+          params: {
+            outpoint,
+          },
+        })
+        .then(response => {
+          sendGATimingEvent('lbrynet', 'getFileList', 'FILE_LIST', gaStartTime, Date.now());
+          handleLbrynetResponse(response, resolve, reject);
+        })
+        .catch(error => {
+          reject(error);
+        });
+    });
+  },
   async abandonClaim({ claimId }) {
     logger.debug(`lbryApi >> Abandon claim "${claimId}"`);
     const gaStartTime = Date.now();
diff --git a/server/utils/awaitFileSize.js b/server/utils/awaitFileSize.js
index 73ce5af1..c1a9543e 100644
--- a/server/utils/awaitFileSize.js
+++ b/server/utils/awaitFileSize.js
@@ -1,27 +1,30 @@
-const fs = require('fs');
-const { promisify } = require('util');
+const { getFileListFileByOutpoint } = require('server/lbrynet');
+const logger = require('winston');
 
-const fsstat = promisify(fs.stat);
-const awaitFileSize = (path, sizeInBytes, timeout, interval) => {
-  return new Promise((resolve, reject) => {
-    let totalTime = 0;
-    let timer = setInterval(() => {
-      totalTime = totalTime + interval;
-      fsstat(path)
-        .then(stats => {
-          if (stats.size > sizeInBytes) {
-            clearInterval(interval);
-            resolve('ready');
-          }
-          if (totalTime > timeout) {
-            const error = new Error('File did not arrive in time');
-            error.name = 'FILE_NOT_ARRIVED';
-            reject(error);
-          }
-        })
-        .catch();
-    }, interval);
+function delay(t) {
+  return new Promise(function(resolve) {
+    setTimeout(resolve, t);
   });
+}
+
+const awaitFileSize = (outpoint, size, interval, timeout) => {
+  logger.debug('awaitFileSize');
+  let start = Date.now();
+  function checkFileList() {
+    logger.debug('checkFileList');
+    return getFileListFileByOutpoint(outpoint).then(result => {
+      logger.debug('File List Result', result);
+      if (result[0]['completed'] === true || result[0]['written_bytes'] > size) {
+        logger.debug('FILE READY');
+        return 'ready';
+      } else if (timeout !== 0 && Date.now() - start > timeout) {
+        throw new Error('Timeout on awaitFileSize');
+      } else {
+        return delay(interval).then(checkFileList);
+      }
+    });
+  }
+  return checkFileList();
 };
 
 module.exports = awaitFileSize;