diff --git a/server/utils/getClaimData.js b/server/utils/getClaimData.js
index 2f8582e6..e0ab2433 100644
--- a/server/utils/getClaimData.js
+++ b/server/utils/getClaimData.js
@@ -1,9 +1,12 @@
 const { details: { host } } = require('@config/siteConfig');
 const chainquery = require('chainquery').default;
+const { getClaim } = require('server/lbrynet');
 
 module.exports = async (data) => {
   // TODO: Refactor getching the channel name out; requires invasive changes.
   const certificateId = data.publisher_id || data.certificateId;
+  const lbrynetUri = `${data.name}#${data.claim_id}`;
+
   let channelName = data.channelName;
 
   if (certificateId && !channelName) {
@@ -15,6 +18,14 @@ module.exports = async (data) => {
     channelShortId = await chainquery.claim.queries.getShortClaimIdFromLongClaimId(certificateId, channelName).catch(() => null);
   }
 
+  let lbrynetClaimResult = null;
+  let lbrynetFileExt = null;
+  if (!data.fileExt) {
+    lbrynetClaimResult = await getClaim(lbrynetUri).catch(() => { return 'invalid URI' });
+    lbrynetFileExt = lbrynetClaimResult && lbrynetClaimResult.file_name.split('.').slice(-1).pop();
+  }
+
+  // TODO verify that "generated_x" does anything at all
   return ({
     name       : data.name,
     title      : data.title,
@@ -23,11 +34,11 @@ module.exports = async (data) => {
     channelShortId,
     contentType: data.content_type || data.contentType,
     claimId    : data.claim_id || data.claimId,
-    fileExt    : data.generated_extension || data.fileExt,
+    fileExt    : data.generated_extension || data.fileExt || lbrynetFileExt,
     description: data.description,
     thumbnail  : data.generated_thumbnail || data.thumbnail_url || data.thumbnail,
     outpoint   : data.transaction_hash_id || data.outpoint,
     host,
-    pending: Boolean(data.height === 0),
+    pending    : Boolean(data.height === 0),
   });
 };