diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2e2737bb..8b3407bad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
    * Fix notification modals when reward is claimed ([#1436])(https://github.com/lbryio/lbry-app/issues/1436) and ([#1407])(https://github.com/lbryio/lbry-app/issues/1407)
    * Fix disabled cards(grayed out) ([#1466])(https://github.com/lbryio/lbry-app/issues/1466)
    * Fix markdown render ([#1179](https://github.com/lbryio/lbry-app/issues/1179))
+   * Fix claim ID being null when reporting a claim that was not previously download ([issue#1512](https://github.com/lbryio/lbry-app/issues/1512)) ([PR#1530](https://github.com/lbryio/lbry-app/pull/1530))
 
 
 ## [0.21.3] - 2018-04-23
diff --git a/src/renderer/component/fileActions/view.jsx b/src/renderer/component/fileActions/view.jsx
index 4ab110fca..6ca72f9bb 100644
--- a/src/renderer/component/fileActions/view.jsx
+++ b/src/renderer/component/fileActions/view.jsx
@@ -11,6 +11,7 @@ type FileInfo = {
 
 type Props = {
   uri: string,
+  claimId: string,
   openModal: ({ id: string }, { uri: string }) => void,
   claimIsMine: boolean,
   fileInfo: FileInfo,
@@ -19,9 +20,7 @@ type Props = {
 
 class FileActions extends React.PureComponent<Props> {
   render() {
-    const { fileInfo, uri, openModal, claimIsMine, vertical } = this.props;
-
-    const claimId = fileInfo ? fileInfo.claim_id : '';
+    const { fileInfo, uri, openModal, claimIsMine, vertical, claimId } = this.props;
     const showDelete = fileInfo && Object.keys(fileInfo).length > 0;
 
     return (
diff --git a/src/renderer/page/file/view.jsx b/src/renderer/page/file/view.jsx
index e8392ff6c..5c5a5414a 100644
--- a/src/renderer/page/file/view.jsx
+++ b/src/renderer/page/file/view.jsx
@@ -160,7 +160,9 @@ class FilePage extends React.Component<Props> {
                 <h1 className="card__title card__title--file">{title}</h1>
                 <div className="card__title-identity-icons">
                   <FilePrice uri={normalizeURI(uri)} />
-                  {isRewardContent && <Icon iconColor="red" tooltip="bottom" icon={icons.FEATURED} />}
+                  {isRewardContent && (
+                    <Icon iconColor="red" tooltip="bottom" icon={icons.FEATURED} />
+                  )}
                 </div>
               </div>
               <span className="card__subtitle card__subtitle--file">
@@ -216,7 +218,7 @@ class FilePage extends React.Component<Props> {
 
             <div className="card__content">
               <FileDownloadLink uri={uri} />
-              <FileActions uri={uri} />
+              <FileActions uri={uri} claimId={claim.claim_id} />
             </div>
 
             <div className="card__content--extra-padding">